Merge branch 'markus' into kay.one

Conflicts:
	NzbDrone/NzbDrone.csproj
	NzbDrone/Providers/ConfigProvider.cs
This commit is contained in:
kay.one 2011-10-09 10:45:08 -07:00
commit 012fa88301
25 changed files with 909 additions and 52 deletions

View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NzbDrone.Model;
using NzbDrone.Providers;
namespace NzbDrone