Merge branch 'master' of github.com:FinalsClub/karmaworld
authorSeth Woodworth <seth@sethish.com>
Sat, 19 Jan 2013 00:26:37 +0000 (19:26 -0500)
committerSeth Woodworth <seth@sethish.com>
Sat, 19 Jan 2013 00:26:37 +0000 (19:26 -0500)
commit1c16a98250526e3b51ec870e9c095920ff9e763d
tree041858f7183406556cfe1577de68cdc769fd6fa2
parentb3e05d1c5db60788d5735fde4318896dae0ebff4
parent487465a73d1c2852b2dc67eba21dbfe2854b5fef
Merge branch 'master' of github.com:FinalsClub/karmaworld
reqs/dev.txt