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

[chiiph at torproject.org]

commit c1e7f608b5a6a281a444f60776d911457b46c497
Merge: f329a00 1feaf55
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon Jan 23 13:16:24 2012 -0300

    Merge branch 'bug4736_donotwarn_backport'

 changes/bug4736                        |    3 +++
 src/vidalia/MainWindow.cpp             |    3 +++
 src/vidalia/config/VidaliaSettings.cpp |    8 ++++++++
 src/vidalia/config/VidaliaSettings.h   |    3 +++
 4 files changed, 17 insertions(+), 0 deletions(-)