From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 19 Jan 2012 15:35:59 +0000 (+0100)
Subject: Merge branch 'pretty' into commerce
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/65916b0958b55a24073cb592e31b6bb7ac0585b9?hp=65916b0958b55a24073cb592e31b6bb7ac0585b9

Merge branch 'pretty' into commerce

Conflicts:
	librarian/cover.py
	librarian/epub.py
	librarian/epub/xsltContent.xsl
	librarian/epub/xsltScheme.xsl
	scripts/book2epub
---