Merge branch '4464-api-project-contents-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 9 Feb 2015 22:10:03 +0000 (17:10 -0500)
committerBrett Smith <brett@curoverse.com>
Mon, 9 Feb 2015 22:10:20 +0000 (17:10 -0500)
commit1d4a39ab3e97c031683ada9f6c98e4c7365fa414
treec0f44761fe6e68d2fc607ccbfa2cd974d303913d
parentd6ec5672045b29aeaf983a78c5487ae354ccb20d
parentf6ab9be0046a6f8d760259c1a0eba8ab7c636903
Merge branch '4464-api-project-contents-wip'

Refs #4464.  Closes #5140.