Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 25 Mar 2012 19:34:00 +0000 (21:34 +0200)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 25 Mar 2012 19:34:00 +0000 (21:34 +0200)

Trivial merge