Merge branch 'pr/24'
authorBrett Smith <brett@curoverse.com>
Wed, 16 Sep 2015 21:30:37 +0000 (17:30 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 16 Sep 2015 21:31:04 +0000 (17:31 -0400)
commitd1327f9456b561c059c18c76f63391728ce1780d
tree9079697c601844435afc2102ddb2f7457abd68cd
parent8806f2d513766f55333807a161ff53b35c6ba6f0
parent5e577ab8c2e6c3a16291d4ff159da6d51220088b
Merge branch 'pr/24'

Closes #7262.