commit ff63bedab34215c6f46a01652bb943b8b04af078 Merge: b304178 50e241f Author: Tomás Touceda chiiph@torproject.org Date: Fri Mar 30 16:51:52 2012 -0300

Merge branch '5518_adv_tab_layout' into alpha

changes/bug5518 | 4 ++++ src/vidalia/config/AdvancedPage.ui | 12 ++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)