From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 13 Jan 2012 16:05:36 +0000 (+0100)
Subject: Merge branch 'production' into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/73ce961f14509aabfa26536f847afd28111029c6?ds=sidebyside;hp=73ce961f14509aabfa26536f847afd28111029c6

Merge branch 'production' into pretty

Conflicts:
	apps/catalogue/models.py
	wolnelektury/settings.py
	wolnelektury/templates/catalogue/main_page.html
	wolnelektury/urls.py
---