Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ded783299
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-22 19:50:18 +01:00

Diff Content Not Available