Merge branch '8079-lookup-token-uuid' closes #8079
authorTom Clegg <tom@curoverse.com>
Mon, 14 Mar 2016 19:06:02 +0000 (15:06 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 14 Mar 2016 19:06:02 +0000 (15:06 -0400)

Trivial merge