Merge branch 'master' into backbone

Conflicts: .gitignore
2012-12-23 00:46:23 -08:00
parent c1d0bc9ac8 4804a18d6d
commit 0bfc6cfe71
57 changed files with 1891 additions and 121 deletions
@@ -1,6 +1,7 @@
 // ReSharper disable InconsistentNaming

 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using FluentAssertions;
@@ -88,6 +89,7 @@ namespace NzbDrone.Common.Test
        public void ToString_on_new_processInfo()
        {
            Console.WriteLine(new ProcessInfo().ToString());
+            ExceptionVerification.MarkInconclusive(typeof(Win32Exception));
        }

    }