Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 15 May 2015 15:28:48 +0000 (17:28 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 15 May 2015 15:28:48 +0000 (17:28 +0200)
commitadc1abda82266eb1169939a72f6f7cb614667b96
tree1bd29ec5e5e99693dffdcc52d33c5dbfa156f78e
parent611f78ed0f5c2056bc03e03b56e3353ac0643033
parentc9d3aea89b2343000b79e52dad236df5beed505e
Merge branch 'master' into next