commit 98716427f158158e55c30b78162b320ea27734bf Merge: 3ee91c1 88569fb Author: Isis Lovecruft isis@torproject.org Date: Wed Feb 5 22:48:31 2014 +0000

Merge branch 'release-0.1.2'

CHANGELOG | 20 +++++++++++++++++--- lib/bridgedb/Bridges.py | 4 ++-- lib/bridgedb/Bucket.py | 1 + lib/bridgedb/Main.py | 21 ++++++++++++++++----- lib/bridgedb/parse/options.py | 28 +++++++++++++++++++++++++++- 5 files changed, 63 insertions(+), 11 deletions(-)