Merge branch '1694-user-agreement'
authorTom Clegg <tom@curoverse.com>
Mon, 30 Dec 2013 23:17:17 +0000 (15:17 -0800)
committerTom Clegg <tom@curoverse.com>
Mon, 30 Dec 2013 23:17:17 +0000 (15:17 -0800)
commit385f300ba44bc186aa679d5aba543260e8ffee1e
tree263d30718ab6c9d08df4cdfd79365708075f6864
parentb973b188a9719d3b05d7c639b22544a18288c0f4
parentd8f04c6a53487419fd256e31ec4da3b0a3056b12
Merge branch '1694-user-agreement'