Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 12 May 2011 19:59:08 +0000 (14:59 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 12 May 2011 19:59:08 +0000 (14:59 -0500)
commitf62ccaac15728cca6dfef40ebc3c63b367f38cbf
tree2a25eb4e2110d102cd6d33d6ba3b399bc2f283e2
parent8b28bee4c1de6f1190091f5c17c0cf0f948c7071
parent21919313dfc18c9f9303cbbb2591c0410379f768
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
mediagoblin/util.py
mediagoblin/util.py