commit e0433c102ab69e64d98d95e01db60443a9a7abe0 Merge: 14cc7b5 9daeccd Author: Tomás Touceda chiiph@torproject.org Date: Sat Dec 24 14:05:06 2011 -0300

Merge branch 'bug3195_startfirefox'

src/vidalia/MainWindow.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)