Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Mon, 2 Apr 2012 13:09:53 +0000 (15:09 +0200)
committerJoar Wandborg <git@wandborg.com>
Mon, 2 Apr 2012 13:09:53 +0000 (15:09 +0200)
commit0e434913747b3f26d3bc0a6660b53505d4a218c8
treeeb46ef83501f950391c07954e2265b35379ee085
parentc8bee965ad2b7ffe4711fafda7b16b8618944d54
parent797f4437eb08c463c3d9f49e526d1750ea6a1c8b
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin