[tor-commits] [bridgedb/develop] Merge branch 'fix/12709-enable-fte' into develop

[isis at torproject.org]

commit 7b158c42b7f8055e4f686458fae0e4718c829c25
Merge: 4a9323d 1a91efe
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Jul 26 05:53:10 2014 +0000

    Merge branch 'fix/12709-enable-fte' into develop

 lib/bridgedb/strings.py             |    1 +
 lib/bridgedb/templates/options.html |    6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)