Merge branch 'master' of http://github.com/fnp/wolnelektury
authorLukasz <lukasz@anwajler.com>
Tue, 18 May 2010 08:30:32 +0000 (10:30 +0200)
committerLukasz <lukasz@anwajler.com>
Tue, 18 May 2010 08:30:32 +0000 (10:30 +0200)
commit735368cfb54c8954518179993dcd3bc55e3878e7
treeb14807db389f33723cc0e1142e926576fd60e3cf
parentfadccea9dfcbacc70e113abb17444654e2e926c3
parentf5ad229ebb7d746137b50d6c8cd957e7dc9b4c0a
Merge branch 'master' of github.com/fnp/wolnelektury

Conflicts:
wolnelektury/settings.py
wolnelektury/templates/catalogue/book_stub_detail.html
wolnelektury/templates/catalogue/search_no_hits.html
wolnelektury/templates/catalogue/tagged_object_list.html
12 files changed:
apps/catalogue/views.py
wolnelektury/settings.py
wolnelektury/static/js/catalogue.js
wolnelektury/templates/404.html
wolnelektury/templates/500.html
wolnelektury/templates/base.html
wolnelektury/templates/catalogue/book_detail.html
wolnelektury/templates/catalogue/book_stub_detail.html
wolnelektury/templates/catalogue/book_text.html
wolnelektury/templates/catalogue/main_page.html
wolnelektury/templates/catalogue/search_no_hits.html
wolnelektury/templates/catalogue/tagged_object_list.html