From: Robert Błaut <listy@blaut.biz>
Date: Sat, 29 Mar 2014 09:16:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.7~99^2~3
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/bddf82ce5ec2a7c34b6b14d3bdb6c4cf24af7388?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'

merge upstream with my own fork
---

bddf82ce5ec2a7c34b6b14d3bdb6c4cf24af7388