commit 18eb653619600be620e997f87939cbe6827b88bb Merge: ced6b22 3e2eed6 Author: Tomás Touceda chiiph@torproject.org Date: Fri Sep 16 10:54:22 2011 -0300

Merge branch 'bug3342_time' into alpha

changes/bug3342 | 2 ++ src/vidalia/config/ServerPage.cpp | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)