Merge pull request #129 from Krellan/master
authorForrest Voight <forrest@forre.st>
Thu, 22 Aug 2013 00:27:41 +0000 (20:27 -0400)
committerForrest Voight <forrest@forre.st>
Thu, 22 Aug 2013 00:27:41 +0000 (20:27 -0400)

Trivial merge