commit b28e9a4ced012b70c6a14630fe937a83bbf3b26c Merge: 56e6b94 aa167c9 Author: Isis Lovecruft isis@torproject.org Date: Sat Mar 21 00:40:50 2015 +0000

Merge branch 'fix/12507-automate-documentation-builds' into develop

Makefile | 6 +++++- setup.cfg | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-)