Merge branch 'master' into stable
commitc65a06774ea2581c618987b903014ce1a819d505
authorintrigeri <intrigeri@boum.org>
Sat, 20 Oct 2018 09:22:31 +0000 (20 09:22 +0000)
committerintrigeri <intrigeri@boum.org>
Sat, 20 Oct 2018 09:22:31 +0000 (20 09:22 +0000)
tree539cf810c03f270986cded5835f9bdf879546744
parentead8d7bf04e26c038d32da28836811b2e11411f5
parent6874492ebafb53ac7e78626eaa5be2438c659574
Merge branch 'master' into stable