commit 63c32b501738e420e05a7617e1bb08bff489af37 Merge: 09a49cd a6edfae Author: Isis Lovecruft isis@torproject.org Date: Thu Apr 17 04:10:02 2014 +0000

Merge branch 'fix/7550-9678-interactive-translations' into develop

lib/bridgedb/EmailServer.py | 29 +------- lib/bridgedb/HTTPServer.py | 94 ++---------------------- lib/bridgedb/test/test_translations.py | 78 ++++++++++++++++++++ lib/bridgedb/translations.py | 122 ++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 113 deletions(-)