Commit Graph

2 Commits

Author SHA1 Message Date
Mark McDowall 0432109a95 Merge branch 'master' of git://github.com/kayone/NzbDrone
Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs
	NzbDrone.Core/Providers/MediaFileProvider.cs
	NzbDrone.Core/Providers/SeriesProvider.cs
2011-06-15 23:49:30 -07:00
kay.one 63f6899894 Added PetaPoco 2011-06-14 19:31:41 -07:00