Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Wed, 13 Sep 2017 15:32:30 +0000 (17:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 13 Sep 2017 15:32:30 +0000 (17:32 +0200)
commitb4285ac6abe18f61334f3a7f09d735e0d097b0d7
treebf183cbd24c0c80dee93403eaea0fdcc7fe7a1c4
parentdfd3797185146144fadca30242f778abb455f859
parent28f472a66b00971964c1ab1c75289b68ea700f3f
Merge branch '3.0'