commit 91142d6c02aa7304d03d768c076aea1ad230db53 Merge: 024c978 a7551e2 Author: Isis Lovecruft <isis@torproject.org> Date: Wed Jul 16 06:52:29 2014 +0000 Merge branch 'rransom/fix/12147-schedule-unittest' into develop lib/bridgedb/schedule.py | 7 ++++++- lib/bridgedb/test/test_schedule.py | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-)