Merge https://github.com/OpenPLi/enigma2
authorims <ims21@users.sourceforge.net>
Wed, 25 Nov 2015 10:10:07 +0000 (11:10 +0100)
committerims <ims21@users.sourceforge.net>
Wed, 25 Nov 2015 10:10:07 +0000 (11:10 +0100)

Trivial merge