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
..
CleanUpDatabaseFixture.cs	QualityTypes no longer an enum	2012-10-13 17:36:16 -07:00
GetNewFilenameFixture.cs	Download naming uses tvdb numbering	2012-10-17 17:06:14 -07:00