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

Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

1 files changed, 0 insertions, 32 deletions

diff --git a/MediaBrowser.Common/Net/Handlers/IHttpServerHandler.cs b/MediaBrowser.Common/Net/Handlers/IHttpServerHandler.cs
deleted file mode 100644
index dadd61473..000000000
--- a/MediaBrowser.Common/Net/Handlers/IHttpServerHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using MediaBrowser.Common.Kernel;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Common.Net.Handlers
-{
-    /// <summary>
-    /// Interface IHttpServerHandler
-    /// </summary>
-    public interface IHttpServerHandler
-    {
-        /// <summary>
-        /// Initializes the specified kernel.
-        /// </summary>
-        /// <param name="kernel">The kernel.</param>
-        void Initialize(IKernel kernel);
-        
-        /// <summary>
-        /// Handleses the request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        bool HandlesRequest(HttpListenerRequest request);
-
-        /// <summary>
-        /// Processes the request.
-        /// </summary>
-        /// <param name="ctx">The CTX.</param>
-        /// <returns>Task.</returns>
-        Task ProcessRequest(HttpListenerContext ctx);
-    }
-}