commit e77fdd860398d352bd032751da8c4d0c3a07654b Merge: dee20f0 dd9e75b Author: Isis Lovecruft isis@torproject.org Date: Wed Apr 2 11:09:29 2014 +0000

Merge remote-tracking branch 'wfn/bug11377_gimpcaptcha' into develop

lib/bridgedb/captcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)