[tor-commits] [vidalia/alpha] Merge branch '5522_vidaliaTab_settings' into alpha

[chiiph at torproject.org]

commit 3f1594e7804ed0162674f8ef3f9e0f588ca1f738
Merge: 565a161 5e1d466
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Mar 30 17:22:20 2012 -0300

    Merge branch '5522_vidaliaTab_settings' into alpha

 changes/bug5522            |    3 +++
 src/vidalia/VidaliaTab.cpp |   12 +++++++-----
 src/vidalia/VidaliaTab.h   |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)