Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Wed, 4 May 2011 09:50:39 +0000 (11:50 +0200)
committerJoar Wandborg <git@wandborg.com>
Wed, 4 May 2011 09:50:39 +0000 (11:50 +0200)
commit7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97
treeec4df697d6785da9f1246d3739df1f39bff8141d
parent1b46208f3e6daa773ed0ac2b7c811db68b8b3123
parent88816492a3776618e2a2a9ad40d49445ebba410d
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin