Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 21 Oct 2012 00:17:57 +0000 (02:17 +0200)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 21 Oct 2012 00:17:57 +0000 (02:17 +0200)

Trivial merge