From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Tue, 12 Nov 2013 11:57:43 +0000 (+0100)
Subject: Merge branch 'master' into rwd
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03?hp=7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03

Merge branch 'master' into rwd

Conflicts:
	apps/wolnelektury_core/templates/superbase.html
---