From: Seth Woodworth <seth@sethish.com>
Date: Sat, 19 Jan 2013 00:26:37 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~551^2~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c16a98250526e3b51ec870e9c095920ff9e763d;p=oweals%2Fkarmaworld.git

Merge branch 'master' of github.com:FinalsClub/karmaworld
---

1c16a98250526e3b51ec870e9c095920ff9e763d
diff --cc reqs/dev.txt
index 7619977,499e791..83de61c
--- a/reqs/dev.txt
+++ b/reqs/dev.txt
@@@ -1,3 -1,3 +1,4 @@@
  -r common.txt
 +django-kombu==0.9.4
  django-debug-toolbar==0.9.4
 -ipython==0.13.1
++ipython==0.13.1