From: Maxious <maxious@lambdacomplex.org>
Date: Fri, 01 Feb 2013 09:22:58 +0000
Subject: Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/disclosr
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=3d49d591236e3fa87e861da3a23806b76ae51a95
---
Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/disclosr

Conflicts:
documents/genericScrapers.py

Former-commit-id: fd782edf0c10bd013c7246ec174f7a5696976167
---