commit b0f56a699e5a65448f0c9a9bb35ce355faa0cbeb Merge: fe45b79 5557f6c Author: Isis Lovecruft <isis@torproject.org> Date: Fri May 16 18:43:43 2014 +0000 Merge branch 'translations/2014-05-16-update' into develop lib/bridgedb/i18n/templates/bridgedb.pot | 93 ++++++++++++++++++------------ 1 file changed, 56 insertions(+), 37 deletions(-)