Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Common/Kernel/BaseKernel.cs

@@ -462,5 +462,16 @@ namespace MediaBrowser.Common.Kernel
         /// <value>The resource pools.</value>
         public ResourcePool ResourcePools { get; set; }
 
+        /// <summary>
+        /// Removes the plugin.
+        /// </summary>
+        /// <param name="plugin">The plugin.</param>
+        public void RemovePlugin(IPlugin plugin)
+        {
+            var list = Plugins.ToList();
+            list.Remove(plugin);
+            Plugins = list;
+        }
+
     }
 }

MediaBrowser.Common/Kernel/IKernel.cs

@@ -123,5 +123,12 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         /// <value>The resource pools.</value>
         ResourcePool ResourcePools { get; set; }
+
+        /// <summary>
+        /// Removes the plugin.
+        /// </summary>
+        /// <param name="plugin">The plugin.</param>
+        void RemovePlugin(IPlugin plugin);
+
     }
 }

MediaBrowser.Controller/Kernel.cs

@@ -536,17 +536,6 @@ namespace MediaBrowser.Controller
             });
         }
 
-        /// <summary>
-        /// Removes the plugin.
-        /// </summary>
-        /// <param name="plugin">The plugin.</param>
-        internal void RemovePlugin(IPlugin plugin)
-        {
-            var list = Plugins.ToList();
-            list.Remove(plugin);
-            Plugins = list;
-        }
-
         /// <summary>
         /// Gets the system info.
         /// </summary>