From: Marcin Koziej <marcinkoziej@nowoczesnapolska.org.pl>
Date: Mon, 3 Feb 2014 14:06:46 +0000 (+0100)
Subject: merge conflicting on stripping spaces
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/134f8c2e9895aae155922f2b6bef9144ded7dfdc?hp=134f8c2e9895aae155922f2b6bef9144ded7dfdc

merge conflicting on stripping spaces
---