commit 9789ba9e3d97681110a75a0be0e47984ebb19f0d Merge: 04a5994 c2fad37 Author: Tomás Touceda chiiph@torproject.org Date: Mon Jan 23 11:18:50 2012 -0300

Merge branch 'bug4736_donotwarn' into alpha

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(-)