Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 11 Jun 2017 09:13:23 +0000 (11:13 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 11 Jun 2017 09:13:23 +0000 (11:13 +0200)
commitb056cc58b1e223aa32d291cbb8af7064424820e4
treea3bbdbd38beaf2fc78d45ac04d3fb71061963684
parent76d16d7f8552fa9845972980d2058186b8e87663
parent99af9f5fc132b3e9325ddd5393dae074a5c2039f
Merge branch 'master' into next