Merge branch 'pretty' into commerce
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 19 Jan 2012 15:35:59 +0000 (16:35 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 19 Jan 2012 15:35:59 +0000 (16:35 +0100)
commit65916b0958b55a24073cb592e31b6bb7ac0585b9
treede003e80313f3cea11f2d171ccb2fa3701fde0c8
parent04007a695c00e4b9191dcd873b6a6d7b96939279
parent3a70fb37a8784ea703eb23d8b19b90bfd00f13bc
Merge branch 'pretty' into commerce

Conflicts:
librarian/cover.py
librarian/epub.py
librarian/epub/xsltContent.xsl
librarian/epub/xsltScheme.xsl
scripts/book2epub
librarian/cover.py
librarian/epub.py
librarian/epub/style.css
librarian/epub/xsltContent.xsl
librarian/epub/xsltScheme.xsl
librarian/packagers.py
scripts/book2epub