Merge branch 'master' into next
commited9bdfd220b75233e5bae2ef39164d14624060fa
authorMarco Wahl <marcowahlsoft@gmail.com>
Thu, 4 Oct 2018 22:54:19 +0000 (5 00:54 +0200)
committerMarco Wahl <marcowahlsoft@gmail.com>
Thu, 4 Oct 2018 22:54:19 +0000 (5 00:54 +0200)
tree99789821ff8e9034e1f5061d2df78812b714342c
parent0954d4c258676320282a1c0c32dbaa113af6af9e
parent0ae2e656d7b15d6d4d150b87be21cbc09b0d2361
Merge branch 'master' into next