From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Wed, 10 Apr 2013 08:00:34 +0000 (+0200)
Subject: Merge branch 'master' into funding
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/6d7b11e4a01b2314c0527d94d91f3159c0bd34ce?hp=6d7b11e4a01b2314c0527d94d91f3159c0bd34ce

Merge branch 'master' into funding

Conflicts:
	requirements.txt
---