Merge branch 'custompdf'
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 29 Mar 2012 09:59:12 +0000 (11:59 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 29 Mar 2012 09:59:12 +0000 (11:59 +0200)
commit5eeb9dace6068f83e2b70b5222cfab0c0a5e71eb
tree0b130f563401617a1387622e504683993097b4f2
parenta6554d68f532f4d15b75f75acd0d85d2b3b7ace2
parent655700e4cde69f00f698a06ca18991eef784ccda
Merge branch 'custompdf'

Conflicts:
wolnelektury/settings/__init__.py
apps/catalogue/models.py
apps/catalogue/utils.py