Merge branch '2044-api-users-index-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 14 Jul 2014 19:10:44 +0000 (15:10 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 14 Jul 2014 19:10:57 +0000 (15:10 -0400)
commitac97e7087df8b48ee289c696b47973618a40ce73
treedb52f241b393c86fd5d2662cf9b3f212a4bf9e19
parent56303d3c734fa0ed9d5f077aac60b97596506efc
parent16bf6c2ad0f88183198701cc6242240f9b194a7b
Merge branch '2044-api-users-index-wip'

Refs #2044.  Closes #3217.