fnp / librarian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: dfab836 9c32ad2)
Merge remote-tracking branch 'upstream/master'
authorRobert Błaut <listy@blaut.biz>
Thu, 27 Feb 2014 16:12:17 +0000 (17:12 +0100)
committerRobert Błaut <listy@blaut.biz>
Thu, 27 Feb 2014 16:12:17 +0000 (17:12 +0100)

Trivial merge