[tor-commits] [vidalia/master] Merge branch 'bug4656_squeeze_backport'

[chiiph at torproject.org]

commit f329a00c9694e3331817b2705301a5e836df7981
Merge: 7955f0c 0ddabf4
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon Jan 23 13:15:00 2012 -0300

    Merge branch 'bug4656_squeeze_backport'

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