Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Tue, 21 Feb 2017 17:30:46 +0000 (18:30 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 21 Feb 2017 17:30:46 +0000 (18:30 +0100)
commitf6a580a5031a957f4f0cde984af79c868beef15b
tree18d757bd98bbb8fe19a7b4044917aea56fb6a562
parent33c3bb4b2d4ece2464f84445a4a3a294bd667103
parent5138adf869508400e2c2fda46e8e46d2c1cc4b7b
Merge branch 'master' into next