Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Conflicts:
	NzbDrone.Core.Test/ParserTest.cs
This commit is contained in:
Mark McDowall
2011-10-24 23:22:34 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -377,4 +377,4 @@ namespace NzbDrone.Core.Test
result.Should().BeNull();
}
}
}
}