From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 29 Mar 2012 09:59:12 +0000 (+0200)
Subject: Merge branch 'custompdf'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5eeb9dace6068f83e2b70b5222cfab0c0a5e71eb?ds=sidebyside;hp=--cc

Merge branch 'custompdf'

Conflicts:
	wolnelektury/settings/__init__.py
---

5eeb9dace6068f83e2b70b5222cfab0c0a5e71eb