From: Joar Wandborg Date: Sat, 28 May 2011 21:52:00 +0000 (+0200) Subject: Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a78c8af8a618ad093b7ce0031825a8f5c56c8f33;p=mediagoblin.git Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin --- a78c8af8a618ad093b7ce0031825a8f5c56c8f33