Merge branch 'master' of ssh://git.kpe.io/home/gitpub/hyperobject
authorKevin M. Rosenberg <kevin@rosenberg.net>
Sat, 29 Aug 2015 06:17:15 +0000 (00:17 -0600)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Sat, 29 Aug 2015 06:17:15 +0000 (00:17 -0600)

Trivial merge