commit 82ede52d56571dbafbdd0db7102388267052fe2e Merge: a768c84 bd6bd83 Author: Isis Lovecruft isis@torproject.org Date: Tue Jun 2 21:06:53 2015 +0000

Merge branch 'fix/16273-gitweb-urls' into develop

doc/proposals/XXX-bridgedb-database-improvements.txt | 4 ++-- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/templates/base.html | 2 +- lib/bridgedb/test/deprecated.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)