From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 30 Jan 2012 16:44:44 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/cb40f164b028883a2fc061307383d0aa98f8b609?ds=inline;hp=--cc

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

Conflicts:
	wolnelektury/templates/catalogue/book_searched.html
---

cb40f164b028883a2fc061307383d0aa98f8b609