Merge branch 'master' into master_internal
authorAndreas Monzner <andreas.monzner@dream-property.net>
Fri, 7 Mar 2014 09:45:15 +0000 (10:45 +0100)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Fri, 7 Mar 2014 09:45:15 +0000 (10:45 +0100)
commit870362f2a2d7ac5030c66310e91a7e644d65ce33
tree5172b2abf180f72954e0cda2d82bd8bad8e3ee04
parentd71073708843f56d991c488ad6cb01253004d506
parentb2adac269f2216be3141d247896b9d093be3fd28
Merge branch 'master' into master_internal

Conflicts:
fritzcall/src/plugin.py
fritzcall/src/plugin.py
infobartunerstate/src/InfoBarTunerState.py
mytube/src/MyTubeService.py
podcast/src/plugin.py