Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 17 Feb 2011 11:03:10 +0000 (12:03 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 17 Feb 2011 11:03:10 +0000 (12:03 +0100)
commit5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be
treee0e6c33cd485e4bc75195ebe9c2cea42e17ef239
parentf157ad52f1bc3be81ccba075aa9218237aa71973
parent1ddbbcc5385554314a1a142d8c2b7919851fe25b
Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental