Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Wed, 4 Jan 2012 23:17:51 +0000 (00:17 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Wed, 4 Jan 2012 23:17:51 +0000 (00:17 +0100)

Trivial merge