Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 23 Jul 2017 06:19:23 +0000 (08:19 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 23 Jul 2017 06:19:23 +0000 (08:19 +0200)
commit94b8b0bcb051e810f2eeef3d11896de58b2b89e2
tree42eb5e58e5e00791c71bb6cb8cfb0ddbb11d9114
parenta8c6d8ff2b52260127a778a2aae44e4f12f6a298
parentc26c52e2bb1f92d10446226b0788205ecb85f53d
Merge branch '3.0'