From: Joar Wandborg Date: Wed, 4 May 2011 09:50:39 +0000 (+0200) Subject: Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97;p=mediagoblin.git Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin --- 7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97