Merge branch 'master' into 2375-log-table
authorBrett Smith <brett@curoverse.com>
Thu, 10 Apr 2014 14:05:28 +0000 (10:05 -0400)
committerBrett Smith <brett@curoverse.com>
Thu, 10 Apr 2014 14:05:28 +0000 (10:05 -0400)

Trivial merge