From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 30 Jan 2012 09:37:42 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/fe3cc2a284f1aa7457b0ec9491203aae100681a6?ds=inline;hp=--cc

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

Conflicts:
	lib/librarian
---

fe3cc2a284f1aa7457b0ec9491203aae100681a6