Merge branch 'master' into master_internal
authorAndreas Monzner <andreas.monzner@dream-property.net>
Sat, 7 Dec 2013 13:19:16 +0000 (14:19 +0100)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Sat, 7 Dec 2013 13:19:16 +0000 (14:19 +0100)
commit736656196b3d8064724a6553908ba508c7b34895
tree696fd8c1d5b824bd3fdcfa4e4c2e6a1410c848b7
parent1c9fb7360857a3a65dbacef1bcae59c5725aa645
parent178e2815ad86843ccdfe8cfeea1dbe07b733fc18
Merge branch 'master' into master_internal
fancontrol2/src/plugin.py
fritzcall/src/plugin.py
infobartunerstate/src/InfoBarTunerState.py
movieretitle/src/plugin.py
virtualzap/src/plugin.py
weatherplugin/src/plugin.py