Mark McDowall 67299f0d97 Merge branch 'master' of git://github.com/kayone/NzbDrone ... Conflicts: NzbDrone.Core.Test/NzbDrone.Core.Test.csproj		2011-07-09 19:48:02 -07:00
..
ConfigProvider.cs	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
DiskProvider.cs	…
HttpProvider.cs	…
UdpProvider.cs	…