[tor-commits] [bridgedb/master] Merge branch 'hotfix/11215_12147-intervalstart' into develop

[isis at torproject.org]

commit 625cbe8b6fd2153ae23be1c4a78e80a90b0b2348
Merge: da121b3 f73deea
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 28 21:03:19 2014 +0000

    Merge branch 'hotfix/11215_12147-intervalstart' into develop

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