commit 264fcce23e2f67690955e246bfb9d4d91f6cc513 Merge: e25686f 40156d7 Author: Tomás Touceda <chiiph@torproject.org> Date: Mon Jan 23 10:59:59 2012 -0300 Merge branch 'bug3146_exit' into alpha changes/bug3146 | 2 ++ src/vidalia/MainWindow.cpp | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)