commit 51938355e973130042fb3f81320c8738ee81ba0e Merge: f9d789e fd477fc Author: Tomas Touceda chiiph@gentoo.org Date: Thu May 5 16:24:55 2011 -0300

Merge remote-tracking branch 'runa/alpha' into alpha

src/vidalia/help/content/po/templates/links.pot | 94 ++++++++++------------- 1 files changed, 40 insertions(+), 54 deletions(-)