commit 59da70abeb09540cf26e59e9a343a97638fa931a Merge: 550fc04 3e2eed6 Author: Tomás Touceda <chiiph@torproject.org> Date: Fri Sep 9 10:48:18 2011 -0300 Merge branch 'bug3342_time' changes/bug3342 | 2 ++ src/vidalia/config/ServerPage.cpp | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)