Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 01:11:36 +0000 (03:11 +0200)
committerJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 01:11:36 +0000 (03:11 +0200)
commit88bcdcd7d28d8e5548aeefa0a69e8af3773870a9
tree0b14edd0dc44691068c631ddfc59ff6c890fc69d
parent5c42a82c5ad4fa410219084a6f43bdc414369114
parent1c424df505b3c9f9cceb84a4fd0ac1867b7ed9b4
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin
mediagoblin/models.py