commit 48178c17c3f250fd8a8a69038355d0c5381f6a68 Merge: caeea27 7c25ed5 Author: Tomás Touceda chiiph@torproject.org Date: Mon May 14 12:23:56 2012 -0300

Merge branch '5766_clicklabel'

changes/bug5766 | 3 +++ src/vidalia/VClickLabel.cpp | 32 +++++++++++++++++++++++++------- src/vidalia/VClickLabel.h | 3 +++ 3 files changed, 31 insertions(+), 7 deletions(-)