Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Mon, 5 Mar 2012 23:36:15 +0000 (00:36 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Mon, 5 Mar 2012 23:36:15 +0000 (00:36 +0100)

Trivial merge