Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 16:27:22 +0000 (17:27 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 16:27:22 +0000 (17:27 +0100)
commite27c5511de8826d542fb998ea91a68795fbf2218
treebb8a171b41117aeba35ca4e8a72e73c9b54f97c7
parente2e1cbcb6d7fa3abbc2d27b31de1a9d83fbd6ba3
parent2c59be96101a0955b4c19f2609c61d91e25a0e65
Merge branch 'master' into next