From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 10 Jan 2012 14:12:30 +0000 (-0600)
Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=73079ac4b8a8b3b355867a1e98aca63313597ad0;p=mediagoblin.git

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
	mediagoblin/db/mongo/models.py
---

73079ac4b8a8b3b355867a1e98aca63313597ad0