Merge branch 'master' of github.com:opendreambox/enigma2-plugins
authorFrank Glaser <glaserfrank@gmail.com>
Tue, 1 Mar 2016 18:47:08 +0000 (19:47 +0100)
committerFrank Glaser <glaserfrank@gmail.com>
Tue, 1 Mar 2016 18:47:08 +0000 (19:47 +0100)
commit76fc61f80d983623a52e187d8207ed26ddfe1da5
tree6db1f933aeefc8a8ffc6726b6469893352fb4bf6
parent816d9773f127419e41d23a1629640c76bdafb251
parent7fcc8c1d48eb9a4f1c75231374520c4d92f5091d
Merge branch 'master' of github.com:opendreambox/enigma2-plugins

# Conflicts:
# autotimer/src/AutoTimer.py
autotimer/src/AutoTimer.py