From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 30 Jan 2012 09:07:04 +0000 (+0100)
Subject: Merge branch 'master' of github.com:fnp/librarian into pretty
X-Git-Tag: 1.7~170
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/5f2702eda7a1b36f4d29658b5468b6b78745218c?ds=sidebyside;hp=--cc

Merge branch 'master' of github.com:fnp/librarian into pretty
---

5f2702eda7a1b36f4d29658b5468b6b78745218c