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

Mon Jan 23 16:45:42 UTC 2012

commit 04a5994272ef504734dca7280dfe9ea919cbbb9d
Merge: d10bf24 4c2fa1a
Author: TomÃ¡s Touceda <chiiph at torproject.org>
Date:   Mon Jan 23 11:15:52 2012 -0300

    Merge branch 'bug4656_squeeze' into alpha

 changes/bug4656                  |    2 ++
 src/vidalia/config/ServerPage.ui |   32 +++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)