From: Christopher Allan Webber Date: Thu, 24 Nov 2011 21:24:58 +0000 (-0600) Subject: Merge remote-tracking branch 'remotes/jwandborg/master' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=99d2ac1d83962fb4dc38f01d63d2ad4036226765;p=mediagoblin.git Merge remote-tracking branch 'remotes/jwandborg/master' --- 99d2ac1d83962fb4dc38f01d63d2ad4036226765