3214: Merge branch 'master' into 3214-permission-to-use-owner-uuid
authorTom Clegg <tom@curoverse.com>
Sat, 19 Jul 2014 00:45:27 +0000 (20:45 -0400)
committerTom Clegg <tom@curoverse.com>
Sat, 19 Jul 2014 00:45:27 +0000 (20:45 -0400)
commit1e5c714b22c71578106890a2255c3e5470102af3
treeba06010c99ac34d3168a07928b550feb0bf729e0
parent68aa07e5c152fd573e254614b34b71957b50ad8c
parent6d3186381b3e6f4735892e4d8198ae4d0ca32cf5
3214: Merge branch 'master' into 3214-permission-to-use-owner-uuid