Merge pull request #920
authorAlexis Christoforides <alexis@thenull.net>
Mon, 28 Apr 2014 22:51:41 +0000 (18:51 -0400)
committerAlexis Christoforides <alexis@thenull.net>
Mon, 28 Apr 2014 22:51:41 +0000 (18:51 -0400)

Trivial merge