projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c42a82 1c424df)
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)
1  2 
mediagoblin/models.py patch | diff1 | diff2 | blob | history

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