Merge branch 'markus' into kay.one

Conflicts:
	NzbDrone.Core.Test/ProviderTests/DiskScanProviderTest.cs
	NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests.cs

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTest.cs

@@ -26,8 +26,9 @@ namespace NzbDrone.Core.Test.ProviderTests
                 .Setup(c => c.GetEpisodeBySeries(It.IsAny<long>()))
                 .Returns(new List<Episode> { new Episode() });
 
-            mocker.GetMock<DiskProvider>().Setup(c => c.FolderExists(It.IsAny<string>())).Returns(true);
+            mocker.GetMock<DiskProvider>()
-
+                .Setup(c => c.FolderExists(It.IsAny<string>()))
+                .Returns(true);
 
             mocker.GetMock<MediaFileProvider>()
                 .Setup(c => c.GetSeriesFiles(It.IsAny<int>()))

NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests.cs

@@ -1,4 +1,4 @@
-// ReSharper disable RedundantUsingDirective
+// ReSharper disable RedundantUsingDirective
 
 using System.Collections.Generic;
 using AutoMoq;