Merge branch 'master' of git://gitorious.org/ozzloy/challenge-bot
authorfeste <festethejester@gmail.com>
Sat, 7 Sep 2013 20:01:46 +0000 (13:01 -0700)
committerfeste <festethejester@gmail.com>
Sat, 7 Sep 2013 20:01:46 +0000 (13:01 -0700)

Trivial merge