[tor-commits] [bridgedb/develop] Merge branch 'fix/12504-config-pts' into develop

[isis at torproject.org]

commit 12996cfe36c7cc763f75f5373bed9f52b8336d1c
Merge: 60c0e8a 3ce7032
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Mar 27 00:31:51 2015 +0000

    Merge branch 'fix/12504-config-pts' into develop

 lib/bridgedb/configure.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)