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

Conflicts:
	MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

1 files changed, 6 insertions, 1 deletions

diff --git a/MediaBrowser.ServerApplication/Networking/NetworkManager.cs b/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
index 4d4d5a451..fc4d26363 100644
--- a/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
+++ b/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
@@ -1,13 +1,13 @@
 using MediaBrowser.Common.Implementations.Networking;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Runtime.InteropServices;
 
 namespace MediaBrowser.ServerApplication.Networking
@@ -17,6 +17,11 @@ namespace MediaBrowser.ServerApplication.Networking
     /// </summary>
     public class NetworkManager : BaseNetworkManager, INetworkManager
     {
+        public NetworkManager(ILogger logger)
+            : base(logger)
+        {
+        }
+
         /// <summary>
         /// Gets the network shares.
         /// </summary>