commit d2757e0846ed515ce130714fcac9e33693792365 Merge: 61b7e05 b592ee0 Author: Tomás Touceda <chiiph@torproject.org> Date: Sat Dec 24 19:07:11 2011 -0300 Merge branch 'bug4379_disableauto' src/vidalia/config/AdvancedPage.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)