Merge branch '6591-6674-6676-nginx-docs-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 18:04:21 +0000 (14:04 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 18:05:00 +0000 (14:05 -0400)
commit434be0f7e6420fee1b99e78466ee4a4d734734c1
tree3bd505ac8873d0af60f035647d059fcb2a5672cb
parent4d6e05c25c6a5d72afee37f8165b006267b4183d
parentb6f800ae7e474f1ceeb827fc9712296a96514592
Merge branch '6591-6674-6676-nginx-docs-wip'

Closes #6591, #6674, #6676, #6739 (woo!).