Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:23:09 +0000 (11:23 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:23:09 +0000 (11:23 +0100)
commitba5fcab217438b995c1f903e0294b71d1411668b
tree241cf5cd4001170753627442e24deb760ba1ed22
parentc72fb90523ab709569016548763d872ae53327e3
parent6a3f59e24b003c417fbf6b31f8a6d87817fec24c
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