Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 24 Feb 2013 19:54:10 +0000 (20:54 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 24 Feb 2013 19:54:10 +0000 (20:54 +0100)

Trivial merge