From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 3 Sep 2012 14:55:43 +0000 (+0200)
Subject: Merge branch 'master' into sunburnt
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/ddaff853c515ef7d188523d9ef17d271901dd581?hp=ddaff853c515ef7d188523d9ef17d271901dd581

Merge branch 'master' into sunburnt

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