[tor-commits] [vidalia/alpha] Merge branch '5554_adv_page_warning' into alpha

[chiiph at torproject.org]

commit e9196cc4da936db58191a7f7086678b842b2377f
Merge: 3b624db 39723db
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Thu Jun 14 19:46:08 2012 -0300

    Merge branch '5554_adv_page_warning' into alpha

 changes/bug5554                    |    3 +++
 src/vidalia/config/AdvancedPage.ui |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)