commit 625cbe8b6fd2153ae23be1c4a78e80a90b0b2348
Merge: da121b3 f73deea
Author: Isis Lovecruft i...@torproject.org
Date: Wed May 28 21:03:19 2014 +
Merge branch 'hotfix/11215_12147-intervalstart' into develop
lib/bridgedb/HTTPServer.py |2 +-
1 file changed, 1 insertion(+), 1
commit b7cd297c85d11a00ee94d2b41b46ddd9762154d1
Merge: f848aa9 f73deea
Author: Isis Lovecruft i...@torproject.org
Date: Wed May 28 21:01:37 2014 +
Merge branch 'hotfix/11215_12147-intervalstart'
lib/bridgedb/HTTPServer.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)