From: jpope <jpope@jpope.org>
Date: Mon, 6 Jan 2014 02:56:28 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2fb6f1d03a121dfde47ab64d5118769106ebe6a5;p=mediagoblin.git

Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

Conflicts:
	.gitmodules
	mediagoblin/static/css/base.css
---

2fb6f1d03a121dfde47ab64d5118769106ebe6a5