From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 4 Dec 2011 03:43:15 +0000 (-0600)
Subject: Merge remote-tracking branch 'remotes/manolinux/645_gmg_adduser_prompt'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cfd20ed6a153ce8cf30063880d4149d6827ee265;p=mediagoblin.git

Merge remote-tracking branch 'remotes/manolinux/645_gmg_adduser_prompt'
---

cfd20ed6a153ce8cf30063880d4149d6827ee265