Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Fri, 30 Dec 2011 12:08:29 +0000 (13:08 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Fri, 30 Dec 2011 12:09:36 +0000 (13:09 +0100)
commit02b46ac5bb9ae5301e4764b9c111c971aa86b333
tree486926fdc0720bd0da83eb14fdaf68efda1fe738
parent9771b4edcbb556927312f624de6263395f82e0ba
parentd52c76021eaf1621b4e55a6eba1df1c0404bd7dd
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
apps/catalogue/urls.py
apps/catalogue/views.py
apps/catalogue/urls.py
apps/catalogue/views.py
lib/librarian