Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 09:37:42 +0000 (10:37 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 09:37:42 +0000 (10:37 +0100)
commitfe3cc2a284f1aa7457b0ec9491203aae100681a6
treefff7310ca82162f6f321302e9b5c8883e8d15915
parentffb9b20e6675a618694fb160c72df285f2666be8
parent0517f19e5fa00611a5b197108e38569462286553
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
lib/librarian