Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Sun, 27 Mar 2016 16:34:18 +0000 (18:34 +0200)
committermh <mh@immerda.ch>
Sun, 27 Mar 2016 16:34:18 +0000 (18:34 +0200)
commit79690fdbe227f412c69e5e31198db7a19a281f50
tree96e4471a80314ee1d2384540da28e7ffe50f5d3a
parentcff3734e4fc76973fd3720f1dd7f50a80e65d5f4
parent039c63890c58b1d7bd637202fa5f86ff52b49ec1
Merge remote-tracking branch 'shared/master'