commit bd19821a6b64a7943c7c75e50698f253e04ba4f4 Merge: 6a9b57f a841d3b Author: Tomás Touceda chiiph@torproject.org Date: Sat Dec 24 17:04:27 2011 -0300

Merge remote-tracking branch 'krkhan/bug4290'

src/vidalia/config/NetworkPage.cpp | 7 +++++++ src/vidalia/help/content/en/config.html | 12 ++++-------- src/vidalia/help/content/po/en/config.po | 14 ++++++-------- src/vidalia/help/content/po/templates/config.pot | 12 ++++-------- 4 files changed, 21 insertions(+), 24 deletions(-)