From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 30 Dec 2011 08:45:20 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/d52c76021eaf1621b4e55a6eba1df1c0404bd7dd?hp=d52c76021eaf1621b4e55a6eba1df1c0404bd7dd

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

Conflicts:
	apps/catalogue/management/commands/importbooks.py
	wolnelektury/templates/catalogue/book_detail.html
	wolnelektury/templates/catalogue/book_short.html
---