Merge branch 'master' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 19 Nov 2013 13:10:35 +0000 (14:10 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 19 Nov 2013 13:10:35 +0000 (14:10 +0100)
commit64cf4d889127d7dc3ea893e8a27711468276dc47
treee7b30fe608cb0cb35de00585fb76c0764b6d450a
parent09896b8a45c2ece2748710090b6130ba32cf9706
parentc7c0b88f1f628f0498c8c53c76a061ec128a228a
Merge branch 'master' into rwd

Conflicts:
apps/catalogue/templates/catalogue/book_short.html
apps/funding/static/funding/funding.css
apps/wolnelektury_core/templates/main_page.html
apps/catalogue/templates/catalogue/book_detail.html
apps/catalogue/templates/catalogue/book_short.html
apps/catalogue/views.py
apps/wolnelektury_core/templates/main_page.html