From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Fri, 30 Dec 2011 12:08:29 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/02b46ac5bb9ae5301e4764b9c111c971aa86b333?hp=02b46ac5bb9ae5301e4764b9c111c971aa86b333

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
	apps/catalogue/urls.py
	apps/catalogue/views.py
---