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

[isis at torproject.org]

commit b7cd297c85d11a00ee94d2b41b46ddd9762154d1
Merge: f848aa9 f73deea
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 28 21:01:37 2014 +0000

    Merge branch 'hotfix/11215_12147-intervalstart'

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