Merge branch 'picture' into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 16 Dec 2011 16:13:21 +0000 (17:13 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 16 Dec 2011 16:13:21 +0000 (17:13 +0100)
commitf906193db2ec44590f57beae2e8ee2df76117b7b
treec4d869b50e0bbeb49b97ddd74e8b796b8ef991a7
parent066ffa84ce4d577668b1a49140fb7facc19451c3
parentc028a70a6130acfe7e86f37f1a9f2e6b36a26194
Merge branch 'picture' into pretty

Conflicts:
apps/catalogue/management/commands/importbooks.py
apps/catalogue/management/commands/importbooks.py
apps/catalogue/models.py
lib/librarian
wolnelektury/settings.py