From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Fri, 10 Jan 2014 16:05:13 +0000 (+0100)
Subject: Merge branch 'master' into rwd
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/1e9113af163a3d002b0b9c3e8c339f22af5b848a?hp=1e9113af163a3d002b0b9c3e8c339f22af5b848a

Merge branch 'master' into rwd

Conflicts:
	apps/catalogue/templates/catalogue/book_short.html
	apps/picture/templates/picture/picture_short.html
	wolnelektury/settings/static.py
---