Merge branch 'master' into f411_new_migrations
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 14 Jul 2011 04:14:42 +0000 (23:14 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 14 Jul 2011 04:14:42 +0000 (23:14 -0500)
commitc47c37ed953689e70441c4c143e4c06f1645be7d
treef63fed482a8e9c8dcd54cf0bd18d747f8516179b
parent59051a23f01eb49ed6fe6975991730021ac169ac
parent6ae8b541f957b49ae86051814097e769d20f29af
Merge branch 'master' into f411_new_migrations

Conflicts:
mediagoblin/db/open.py
mediagoblin/app.py
mediagoblin/db/open.py
mediagoblin/db/util.py