Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorxray7224 <xray7224@googlemail.com>
Sun, 14 Jul 2013 16:31:03 +0000 (17:31 +0100)
committerxray7224 <xray7224@googlemail.com>
Sun, 14 Jul 2013 16:31:03 +0000 (17:31 +0100)

Trivial merge