Merge pull request #485 from JesperSchultz/master

fix for combined matchers in sinon

sinon/sinon-1.5.d.ts

@@ -302,8 +302,8 @@ interface SinonStatic {
 }
 
 interface SinonMatcher {
-	and(expr: SinonMatch): SinonMatcher;
-	or(expr: SinonMatch): SinonMatcher;
+	and(expr: SinonMatcher): SinonMatcher;
+	or(expr: SinonMatcher): SinonMatcher;
 }
 
 interface SinonMatch {

sinon/sinon-tests.ts

@@ -76,10 +76,15 @@ function testSeven() {
 	mockObj.expects('functionToTest').once();
 }
 
+function testEight() {
+    var combinedMatcher = sinon.match.typeOf("object").and(sinon.match.has("pages"));
+}
+
 testOne();
 testTwo();
 testThree();
 testFour();
 testFive();
 testSix();
-testSeven();
+testSeven();
+testEight();