From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 16 Dec 2011 16:13:21 +0000 (+0100)
Subject: Merge branch 'picture' into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/f906193db2ec44590f57beae2e8ee2df76117b7b?hp=f906193db2ec44590f57beae2e8ee2df76117b7b

Merge branch 'picture' into pretty

Conflicts:
	apps/catalogue/management/commands/importbooks.py
---