commit 3668bd48a2342735c50a50ad0550220ccfea0de6 Merge: a9680d7 c121db9 Author: Tomás Touceda chiiph@torproject.org Date: Fri Sep 16 11:19:21 2011 -0300

Merge branch 'bug3759_basiclog' into alpha

changes/bug3759 | 3 +++ src/vidalia/log/StatusEventItem.cpp | 12 ++++++------ src/vidalia/log/StatusEventItem.h | 6 +++--- src/vidalia/log/StatusEventWidget.cpp | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-)