Merge branch 'markus101'

Conflicts:
	NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs
This commit is contained in:
kay.one
2011-04-20 18:29:41 -07:00
3 changed files with 14 additions and 2 deletions
@@ -1,4 +1,4 @@
using System.ServiceModel.Syndication;
using System.ServiceModel.Syndication;
using NLog;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;