commit f8907b32eade1ecf8c40983c664c5e7c4ac2e427 Merge: 91142d6 4224107 Author: Isis Lovecruft <isis@torproject.org> Date: Tue Jul 22 22:43:58 2014 +0000 Merge branch 'fix/12627-hotfixes' into develop lib/bridgedb/email/autoresponder.py | 35 ++++++++++++++++++----------------- lib/bridgedb/email/server.py | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-)