Merge branch 'master' into dns-meta

adferrand · Jan 6, 2016 · b4c761a · b4c761a
2 parents a00094f + f1c0741
commit b4c761a
Show file tree

Hide file tree

Showing 23 changed files with 1,147 additions and 201 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,3 @@ _testmain.go
 *.test
 *.prof
 *.coverprofile
-
-boulder-start/boulder-start
-activity-monitor/activity-monitor
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json