Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 14:16:12 +0000 (09:16 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 14:16:12 +0000 (09:16 -0500)
commitda579dec005834f92fb7d968e14610be9936d9a5
tree5ee9d31e00dc346c1b47ef2a2b49c354546ff09e
parent2f968422e911e59b40d3334cac366b4dca011fd5
parente893094a06ab5d659b82c2d2fe646b1545c131dd
Merge remote branch 'remotes/elrond/idea/clean_celery_setup'

Conflicts:
mediagoblin/celery_setup/from_celery.py
mediagoblin/celery_setup/from_celery.py