Merge branch 'maint'
commit8766780bc5c07bfdc8c6fcec1f1c8c4f54f91246
authorMarco Wahl <marcowahlsoft@gmail.com>
Sun, 23 Sep 2018 14:33:05 +0000 (23 16:33 +0200)
committerMarco Wahl <marcowahlsoft@gmail.com>
Sun, 23 Sep 2018 14:33:05 +0000 (23 16:33 +0200)
treec9f764fae71e35e3abdd26d1fb011e5346aadbb5
parentb197f851f7cc55084de6174cd72074069bd1f6c6
parenteb9955a28f6c10423a4ddbe0cb5c7eb6c05e3b55
Merge branch 'maint'