fnp / librarian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9868276 75a1b6f)
Merge remote-tracking branch 'upstream/master'
authorRobert Błaut <listy@blaut.biz>
Sat, 29 Mar 2014 09:16:30 +0000 (10:16 +0100)
committerRobert Błaut <listy@blaut.biz>
Sat, 29 Mar 2014 09:16:30 +0000 (10:16 +0100)
merge upstream with my own fork


Trivial merge