From: Christopher Allan Webber Date: Tue, 14 Jun 2011 02:02:16 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3fd659e0eb89f56b696d96b4b7aed89aacdfba4c;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 3fd659e0eb89f56b696d96b4b7aed89aacdfba4c