Merge branch 'master' of github.com:Stricted/speedport-hybrid-php-api
authorStricted <info@stricted.de>
Tue, 12 Jan 2016 11:33:34 +0000 (12:33 +0100)
committerStricted <info@stricted.de>
Tue, 12 Jan 2016 11:33:34 +0000 (12:33 +0100)

Trivial merge