Merge branch 'master' of https://github.com/noprompt/frak
authorJoel Holdbrooks <cjholdbrooks@gmail.com>
Wed, 7 Aug 2013 06:29:32 +0000 (23:29 -0700)
committerJoel Holdbrooks <cjholdbrooks@gmail.com>
Wed, 7 Aug 2013 06:29:32 +0000 (23:29 -0700)

Trivial merge