From: Joar Wandborg Date: Fri, 1 Jul 2011 20:02:58 +0000 (+0200) Subject: Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fe5f8a281a3cd5d2e449866caaa410b06e488588;p=mediagoblin.git Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin --- fe5f8a281a3cd5d2e449866caaa410b06e488588