Merge branch 'qbe' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 14:01:20 +0000 (10:01 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 14:01:20 +0000 (10:01 -0400)
Conflicts:
versions.cfg

1  2 
buildout.cfg
project/settings.py
versions.cfg

diff --cc buildout.cfg
Simple merge
Simple merge
diff --cc versions.cfg
@@@ -55,5 -54,5 +55,8 @@@ simplejson = 2.5.
  # auf.django.emploi==1.0dev
  httplib2 = 0.7.4
  
 +# Added by Buildout Versions at 2012-06-01 12:21:26.475594
 +setuptools = 0.6c12dev-r88846
++
+ # Added by Buildout Versions at 2012-05-30 13:39:28.023002
+ django-picklefield = 0.2.1