commit 83bdce523a74e8597281f0e395fff9ff875f399d Merge: 193c80a 4ad7667 Author: Isis Lovecruft isis@torproject.org Date: Thu Mar 19 22:17:37 2015 +0000

Merge branch 'translations/2015-03-19-update' into develop

lib/bridgedb/i18n/templates/bridgedb.pot | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)