Lidarr/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests
Mark McDowall 5bbe310af5 Merge branch 'xem' into 'master'
Conflicts:
	NzbDrone.Common/DiskProvider.cs
	NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
	NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs
	NzbDrone.Core/Providers/DiskScanProvider.cs
	NzbDrone.Core/Providers/DownloadProvider.cs
2012-10-20 16:07:04 -07:00
..
EpisodeProviderTest.cs
EpisodeProviderTest_DeleteInvalidEpisodes.cs
EpisodeProviderTest_GetEpisodesByParseResult.cs
GetEpisodeBySceneNumberFixture.cs