Merge branch '6967-application-yml-without-git-wip'
authorBrett Smith <brett@curoverse.com>
Fri, 25 Sep 2015 14:38:37 +0000 (10:38 -0400)
committerBrett Smith <brett@curoverse.com>
Fri, 25 Sep 2015 14:38:47 +0000 (10:38 -0400)
commit5a55113805af906145449be18ec86b1a95a5017b
treecb56b55408d1d3bbdc5269469f43df44ab08d9ae
parent99349abd0ee7347b5bac3d4a9638853c6d4b97ab
parent285c0092f8ae4d757e31754c91314baa4db5af44
Merge branch '6967-application-yml-without-git-wip'

Closes #6967, #7375.