[tor-commits] [bridgedb/master] Merge branch 'translations/2014-05-07-update' into develop

[isis at torproject.org]

commit 8ea18f7525d92fbbda21b64f0267b33f050754d3
Merge: 91d6e2c 2c9f700
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 14 03:26:03 2014 +0000

    Merge branch 'translations/2014-05-07-update' into develop

 Makefile                                 |    3 +
 lib/bridgedb/i18n/templates/bridgedb.pot |  344 ++++++++++++++++++++++++------
 setup.cfg                                |    7 +-
 setup.py                                 |    5 +-
 4 files changed, 294 insertions(+), 65 deletions(-)