Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Wed, 15 Jun 2011 20:18:24 +0000 (22:18 +0200)
committerJoar Wandborg <git@wandborg.com>
Wed, 15 Jun 2011 20:18:24 +0000 (22:18 +0200)
commit9e883ed3b223311e3325e41e75dec7ee82875ac2
treede5c404187681bf35d7a92e917c54a69e902df91
parenta48014d67a5185c645ac876d365b4cb85cbb6b1f
parent0e9dd2a28669a4d42c4a3828dbd047937acd776c
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin
mediagoblin/db/models.py
mediagoblin/util.py