From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 30 Jan 2012 16:18:31 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/01d7c5f6d52a56a9800ea7eccfeb25762261813d?hp=01d7c5f6d52a56a9800ea7eccfeb25762261813d

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
	wolnelektury/static/js/search.js
---