[tor-commits] [bridgedb/master] Merge branch 'fix/15155-instructions-string' into develop

[isis at torproject.org]

commit 193c80a27b150bbc260f90c33998781301b32165
Merge: 35ace70 1a5f320
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Mar 19 22:07:44 2015 +0000

    Merge branch 'fix/15155-instructions-string' into develop

 lib/bridgedb/strings.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)