Merge branch 'markus101/NzbDrone'

Conflicts:
	NzbDrone.Core/CentralDispatch.cs
	NzbDrone.Core/NzbDrone.Core.csproj
	NzbDrone.Web/Views/Settings/Indexers.ascx
This commit is contained in:
kay.one
2011-04-19 18:51:42 -07:00
13 changed files with 323 additions and 237 deletions

View File

@@ -75,7 +75,5 @@ namespace NzbDrone.Core.Providers
}
}
}
}
}