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)
commite092686dfff99c65158ced79b1d7a806f73c700b
tree796161ef070567617e1a4683489ed8e234a8f606
parent664a13f8ff7970c6ef1d6efe6ec7ab2dda67a838
parent0316dce2b961d9697c2aa2456f69706f700654e8
Merge branch 'master' of git://gitorious.org/ozzloy/challenge-bot