commit b375385dae45ee9e3eeb5d030923f7906ca5bcf1 Merge: ff19c25 bc83c37 Author: Runa A. Sandvik <runa.sandvik@gmail.com> Date: Thu May 5 20:13:09 2011 +0100 Merge branch 'master' into alpha src/vidalia/help/content/po/templates/links.pot | 108 ++++++++++------------- 1 files changed, 47 insertions(+), 61 deletions(-)