[tor-commits] [vidalia/master] Fold in more changes

[chiiph at torproject.org]

commit 3039905652be90601b7da7ac804a8fce64fcc52f
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon May 14 12:25:57 2012 -0300

    Fold in more changes
---
 CHANGELOG       |    2 ++
 changes/bug5766 |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8dc6178..b2a45a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,8 @@
   o Enable Burmese, Croatian, Basque and Serbian translation.
   o Remove the "Find bridges" button in order to avoid compromising
     users that need to hide behind tor at all times. Fixes bug 5371.
+  o Add visual feedback from VClickLabel when in "pressed" state.
+    Resolves ticket 5766.
 
 0.2.17  11-Feb-2012
   o Improve the translation policy: do not remove translations that
diff --git a/changes/bug5766 b/changes/bug5766
deleted file mode 100644
index 6332721..0000000
--- a/changes/bug5766
+++ /dev/null
@@ -1,3 +0,0 @@
-  New Features:
-  o Add visual feedback from VClickLabel when in "pressed" state.
-    Resolves ticket 5766.