From: Marcin Koziej <marcin@lolownia.org>
Date: Sat, 7 Dec 2013 17:17:06 +0000 (+0100)
Subject: merging master
X-Git-Tag: 1.7~121
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/32177c13e6f1f07741f559601064538a65ce00fd?ds=sidebyside;hp=32177c13e6f1f07741f559601064538a65ce00fd

merging master
---