Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Tue, 3 May 2011 18:04:55 +0000 (20:04 +0200)
committerJoar Wandborg <git@wandborg.com>
Tue, 3 May 2011 18:04:55 +0000 (20:04 +0200)
commit1b46208f3e6daa773ed0ac2b7c811db68b8b3123
tree7b44d7cced588ddd58ac795e9b778bcad7055b4d
parent65f24846540052ec58174296190578a3323cac12
parent9610848c298fff67da83abd495a44be86dd4eea3
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin