Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorBrandon Invergo <brandon@invergo.net>
Sun, 19 May 2013 11:23:17 +0000 (13:23 +0200)
committerBrandon Invergo <brandon@invergo.net>
Sun, 19 May 2013 11:23:17 +0000 (13:23 +0200)

Trivial merge