Merge branch 'master' of https://github.com/OpenPLi/enigma2
authormeo <lupomeo@hotmail.com>
Tue, 29 Dec 2015 08:59:31 +0000 (09:59 +0100)
committermeo <lupomeo@hotmail.com>
Tue, 29 Dec 2015 08:59:31 +0000 (09:59 +0100)
commit44654e8866f635a5c2939774e73842bb55e9a802
treee73d0d23c159222778765747521345f5e286f23c
parent22db6af6da7eb0fa4f89f9fcf65d7f60b71bf66e
parentab8207747eb1b4ca227923de2f17ec8c4b9e1fc4
Merge branch 'master' of https://github.com/OpenPLi/enigma2

Conflicts:
configure.ac
lib/python/Components/NimManager.py
configure.ac
lib/python/Components/NimManager.py
lib/python/Components/UsageConfig.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/MovieSelection.py
main/Makefile.am