[tor-commits] [bridgedb/master] Merge branch 'fix/11345-qrcodes_r2' into develop

[isis at torproject.org]

commit 177edfd8a0a232796973b20d7c3222ba66478309
Merge: a973271 129dc99
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Feb 10 06:04:02 2015 +0000

    Merge branch 'fix/11345-qrcodes_r2' into develop

 lib/bridgedb/qrcodes.py           |    8 ++--
 lib/bridgedb/test/test_qrcodes.py |   73 +++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 4 deletions(-)