Merge branch 'develop'

This commit is contained in:
Mark McDowall
2013-09-23 10:06:45 -07:00
236 changed files with 1864 additions and 1199 deletions
@@ -154,12 +154,6 @@ namespace NzbDrone.Core.MetadataSource
{
DateTime result;
//Todo: Remove this when DST ends and/or trakt fixes DST airings in EST/EDT
if (iso != null && iso.EndsWith("-05:00"))
{
iso = iso.Replace("-05:00", "-04:00");
}
if (!DateTime.TryParse(iso, out result))
return null;