Commit Graph

1 Commits

Author SHA1 Message Date
kay.one 012fa88301 Merge branch 'markus' into kay.one
Conflicts:
	NzbDrone/NzbDrone.csproj
	NzbDrone/Providers/ConfigProvider.cs
2011-10-09 10:45:08 -07:00