Best merge ever

bzr-revno: 564
This commit is contained in:
Tim Bentley 2009-09-22 19:53:47 +01:00
commit 85f727962f
1 changed files with 1 additions and 2 deletions

View File

@ -111,8 +111,7 @@ def contextMenuSeparator(base):
from eventreceiver import Receiver
from settingsmanager import SettingsManager
from pluginconfig import PluginConfig
from plugin import PluginStatus
from plugin import Plugin
from plugin import PluginStatus, Plugin
from pluginmanager import PluginManager
from settingstab import SettingsTab
from mediamanageritem import MediaManagerItem