Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into f298_create...
authorJoar Wandborg <git@wandborg.com>
Mon, 8 Aug 2011 01:48:27 +0000 (03:48 +0200)
committerJoar Wandborg <git@wandborg.com>
Mon, 8 Aug 2011 01:48:27 +0000 (03:48 +0200)

Trivial merge