From: Joar Wandborg Date: Thu, 30 Jun 2011 09:48:52 +0000 (+0200) Subject: Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=40d18ad4c6d66d6db1aaf43df8d6ba23d162f77f;p=mediagoblin.git Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin --- 40d18ad4c6d66d6db1aaf43df8d6ba23d162f77f