From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 30 Jan 2012 11:45:28 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/f43bad97b17e376293c0a72e9c1726733fc285fa?ds=sidebyside;hp=--cc

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

Conflicts:
	lib/librarian
---

f43bad97b17e376293c0a72e9c1726733fc285fa