Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
commitf08a200f0909c0b98a60870d8d89de9f34467e2a
treebf5a67426894d3fc19317a5265983b62bbbf2573
parentba5fcab217438b995c1f903e0294b71d1411668b
parent03706708fac0d7ac8cf0b63af9e473416f42e1b5
Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py