Merge branch 'master' into processing
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 12 Aug 2011 03:54:11 +0000 (22:54 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 12 Aug 2011 03:54:11 +0000 (22:54 -0500)
commitba4858c5b4f639d0438b7a6d53a7a731424a430d
tree69ad17bc78d0b188fd6c9e75d40e4e390ca318fd
parent07934b442f7cd3abae18eecdf533de004f88e6b1
parent788272f30034fb2f917496197e317226d21aad2e
Merge branch 'master' into processing

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py