Merge https://github.com/OpenPLi/enigma2
authorims <ims21@users.sourceforge.net>
Sun, 22 Nov 2015 16:35:44 +0000 (17:35 +0100)
committerims <ims21@users.sourceforge.net>
Sun, 22 Nov 2015 16:35:44 +0000 (17:35 +0100)

Trivial merge