Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 30 Jul 2011 18:09:01 +0000 (13:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 30 Jul 2011 18:09:01 +0000 (13:09 -0500)
commit3cdf366acfb577e735abc7fee6c8395fa97c8b48
tree7a7287235d3597cebc0272532971726e10110e47
parent482d53cd30229798ff58f9d6f3cbb3b86f94f218
parentf99b5caeb68cb60d768f0e049388a6f4a8b68ac0
Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags

Conflicts:
mediagoblin/config_spec.ini
mediagoblin/edit/views.py
mediagoblin/util.py
mediagoblin/config_spec.ini
mediagoblin/db/indexes.py
mediagoblin/db/models.py
mediagoblin/edit/forms.py
mediagoblin/edit/views.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/util.py