Merge branch '1904-api-reader-tokens'
authorBrett Smith <brett@curoverse.com>
Wed, 30 Apr 2014 17:31:38 +0000 (13:31 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 30 Apr 2014 17:31:56 +0000 (13:31 -0400)
commite8f81804c24307b6702b1897c80b4be832254454
treeaa95efecc70ca9768bce11c87190ae93d896c7e7
parent840e7d7f96f763ae139545dca5d6dfa5a54f6cc6
parent1812950e91daaf7a1b02e3777c4e1d483b42d018
Merge branch '1904-api-reader-tokens'

Closes #2702, #2707.