Merge branch 'markus' into kay.one

Conflicts:
	NzbDrone.Core.Test/ProviderTests/LogProviderTest.cs
This commit is contained in:
kay.one 2011-10-20 22:08:55 -07:00
commit 651a63edea
24 changed files with 330 additions and 96 deletions

View file

@ -266,4 +266,4 @@ namespace NzbDrone.Core.Test.ProviderTests
logs.TotalItems.Should().Be(100);
}
}
}
}