Merge pull request #2474 from akarnokd/MergeTestTimeout

MergeTest.testConcurrency timeout to let other tests run

Author: akarnokd

src/test/java/rx/internal/operators/OperatorMergeTest.java

@@ -494,7 +494,7 @@ public void call() {
         });
     }
 
-    @Test
+    @Test(timeout = 10000)
     public void testConcurrency() {
         Observable<Integer> o = Observable.range(1, 10000).subscribeOn(Schedulers.newThread());