commit 764b202fcc299731eb09dc7a8f95d22582908e07 Merge: 30139ec 19f605c Author: Tomás Touceda <chiiph@torproject.org> Date: Fri Sep 16 11:23:33 2011 -0300 Merge branch 'bug3759_basiclog_backport' 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(-)