From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 26 Nov 2012 18:50:17 +0000 (-0600)
Subject: Merge remote-tracking branch 'elrond/for-schendje'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dc0b39b74741e7f4a7ba975c7ee98953bbf38816;p=mediagoblin.git

Merge remote-tracking branch 'elrond/for-schendje'
---

dc0b39b74741e7f4a7ba975c7ee98953bbf38816