commit 74cdb092998f006a1253aef74e96b3884dd014eb Merge: 1ed4585 09198e1 Author: Isis Lovecruft <isis@torproject.org> Date: Wed Jul 30 21:15:09 2014 +0000 Merge branch 'master' into develop lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)