From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Wed, 28 Dec 2011 09:14:23 +0000 (+0100)
Subject: merge wyszukiwania.
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/9fbf0c4158a9427442171629a564e2de7780b5b7?hp=9fbf0c4158a9427442171629a564e2de7780b5b7

merge wyszukiwania.

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

Conflicts:
	lib/librarian
	wolnelektury/templates/base.html
---