simple merge

This commit is contained in:
Johnson Chetty 2012-04-30 10:07:49 +02:00
commit ec4f3346ec

View File

@ -1,4 +1,4 @@
-e svn+http://code.djangoproject.com/svn/django/branches/releases/1.3.X/#egg=django Django==1.3
#-e svn+http://code.djangoproject.com/svn/django/trunk/#egg=django #-e svn+http://code.djangoproject.com/svn/django/trunk/#egg=django
-e bzr+http://code.0x2620.org/python-ox/#egg=python-ox -e bzr+http://code.0x2620.org/python-ox/#egg=python-ox
-e git+git://github.com/seatgeek/fuzzywuzzy.git#egg=fuzzywuzzy -e git+git://github.com/seatgeek/fuzzywuzzy.git#egg=fuzzywuzzy