Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 30 Dec 2011 08:45:20 +0000 (09:45 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 30 Dec 2011 08:45:20 +0000 (09:45 +0100)
commitd52c76021eaf1621b4e55a6eba1df1c0404bd7dd
treed72ad2bd5a9da4fc2a6ea1b8111427340e2c3c99
parent938fc832934e508085dad3645c01060a4dc9f0c9
parent075fb07f19c2f20cd3b6818b973e7aebebdacc9f
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
apps/catalogue/management/commands/importbooks.py
apps/catalogue/models.py
apps/catalogue/urls.py
wolnelektury/settings.py
wolnelektury/templates/catalogue/book_detail.html
wolnelektury/templates/catalogue/book_short.html