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
..
AddSeries	…
History	…
Log	…
Missing	…
Series	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
Settings	XbmcProvider updated to include new Json API methods.	2011-07-09 11:19:33 -07:00
Shared	…
System	…
Upcoming	…
Web.config	…
_ViewStart.cshtml	…