Merge branch 'master' into master_internal
authorAndreas Monzner <andreas.monzner@dream-property.net>
Sat, 17 Aug 2013 09:29:07 +0000 (11:29 +0200)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Sat, 17 Aug 2013 09:29:07 +0000 (11:29 +0200)
commit94cfec754135ba56e8fc8f8b79a4bf251f5c9df9
tree94e7575ef14abfb9d8e9689abb0d64d318d9ac2b
parent2583c5e4211c35d0dcf30b3d49f8b3d6a79e29d6
parentcf0e4e4e9d2c371e2469eb4a8a0468201fb329d3
Merge branch 'master' into master_internal

Conflicts:
elektro/src/plugin.py
epgrefresh/src/plugin.py
elektro/src/plugin.py