Merge branch 'MT2016-11-14'
authorBernhard Tittelbach <bernhard@tittelbach.org>
Thu, 17 Nov 2016 16:14:34 +0000 (17:14 +0100)
committerBernhard Tittelbach <bernhard@tittelbach.org>
Thu, 17 Nov 2016 16:18:04 +0000 (17:18 +0100)
commit5a5788d49aba96cfbe4a588017409f725a2e1610
treef4b5737c290acc2e781acc725f68f3db8a5bb857
parent0da88da81d37436b76e58a7492095c3ed9a8804d
parent2640a1a0fc593c8e013321c65d379b7ec1c0cce4
Merge branch 'MT2016-11-14'