[tor-commits] [vidalia/master] Merge remote-tracking branch 'erinn/no-remote'

[chiiph at torproject.org]

commit a47326a1312268babfa121504fe85a4d6e85af62
Merge: d5ed906 8b5a3bd
Author: Tomas Touceda <chiiph at torproject.org>
Date:   Sat Jun 11 03:18:34 2011 -0300

    Merge remote-tracking branch 'erinn/no-remote'

 src/vidalia/MainWindow.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)