[tor-commits] [vidalia/alpha] Merge branch 'bug4048_unlinkportconf' into alpha

[chiiph at torproject.org]

commit 44260099f728d9c5503955d1de8244accc97e9b7
Merge: f3d84d5 a5ecfd4
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon Jan 23 11:47:50 2012 -0300

    Merge branch 'bug4048_unlinkportconf' into alpha

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