commit 342d88c9c1c80949b1cd3fa77371f75b571e19d9 Merge: 1334480 4892730 Author: Tomas Touceda chiiph@gentoo.org Date: Thu May 5 16:24:49 2011 -0300

Merge remote-tracking branch 'runa/master'

src/vidalia/help/content/po/templates/links.pot | 66 ++++++++--------------- 1 files changed, 22 insertions(+), 44 deletions(-)