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

[chiiph at torproject.org]

commit cf0296af3610acf03837a322df4f24c1ad2d0ea8
Merge: ba95f9a 743a557
Author: Tomas Touceda <chiiph at gentoo.org>
Date:   Tue May 3 11:02:22 2011 -0300

    Merge branch 'bug2644_share' into alpha

 src/vidalia/config/ServerPage.cpp     |   97 ++++++++++++++++++++-------------
 src/vidalia/config/ServerPage.ui      |    9 +++-
 src/vidalia/config/ServerSettings.cpp |   18 ++++++-
 src/vidalia/config/ServerSettings.h   |    6 ++
 4 files changed, 89 insertions(+), 41 deletions(-)