Merge remote branch 'remotes/gullydwarf-cfdv/f360_tagging' into mergetags
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 30 Jul 2011 18:37:33 +0000 (13:37 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 30 Jul 2011 18:37:33 +0000 (13:37 -0500)
commitae31c364395bba22e54c1f91f1a680260dee5aa0
tree7c657c0a48755bd0d0bf49216c4793a656d31777
parent3cdf366acfb577e735abc7fee6c8395fa97c8b48
parent8ff4dec742d0b9f375afd9d1862a560e1be200d1
Merge remote branch 'remotes/gullydwarf-cfdv/f360_tagging' into mergetags

Conflicts:
mediagoblin/tests/test_submission.py
mediagoblin/tests/test_submission.py