Merge branch 'maint'
commit269009d297c28cd47c037c72b446469bcc7c22da
authorMarco Wahl <marcowahlsoft@gmail.com>
Thu, 28 Dec 2017 14:44:34 +0000 (28 15:44 +0100)
committerMarco Wahl <marcowahlsoft@gmail.com>
Thu, 28 Dec 2017 14:44:34 +0000 (28 15:44 +0100)
tree67e09a4fef3bba9f858ad7f00976fe1e9daece37
parentd934d1a89a950670b0de8b6c2c9af1f38ab90d83
parentab6135779170b28ed9c968da0120a5e2e8e64890
Merge branch 'maint'