projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1ae76a b93a6a2)
Merge remote branch 'remotes/aleks/aleks'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 1 Jun 2011 00:17:28 +0000 (19:17 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 1 Jun 2011 00:17:28 +0000 (19:17 -0500)
1  2 
mediagoblin/db/models.py patch | diff1 | diff2 | blob | history

diff --cc mediagoblin/db/models.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.