From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Tue, 19 Nov 2013 13:10:35 +0000 (+0100)
Subject: Merge branch 'master' into rwd
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/64cf4d889127d7dc3ea893e8a27711468276dc47?hp=64cf4d889127d7dc3ea893e8a27711468276dc47

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
---