commit bc4a613681fb7bdc282ba4d0a38c005ff9f96dae Merge: 32d71db e927cb8 Author: Isis Lovecruft isis@torproject.org Date: Fri Mar 20 22:37:41 2015 +0000

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

lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)