diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-12 09:16:12 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-12 09:16:12 -0500 |
commit | da579dec005834f92fb7d968e14610be9936d9a5 (patch) | |
tree | 5ee9d31e00dc346c1b47ef2a2b49c354546ff09e /setup.py | |
parent | 2f968422e911e59b40d3334cac366b4dca011fd5 (diff) | |
parent | e893094a06ab5d659b82c2d2fe646b1545c131dd (diff) | |
download | mediagoblin-da579dec005834f92fb7d968e14610be9936d9a5.tar.lz mediagoblin-da579dec005834f92fb7d968e14610be9936d9a5.tar.xz mediagoblin-da579dec005834f92fb7d968e14610be9936d9a5.zip |
Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
Conflicts:
mediagoblin/celery_setup/from_celery.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions