Merge branch 'master' of git://github.com/zendframework/zf2 into search

zendframework · May 9, 2012 · c88317e · c88317e
13 parents c2c0c90 + 4d8678c + b5fe867 + dd6dd90 + fe69d86 + 7e4c1bb + c718944 + 032f2c6 + e587c4a + afb2df9 + 4ea8d76 + 9dfff7d + ea632d6
commit c88317e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -8,7 +8,7 @@ for tested in "${testedcomponents[@]}"
     do
         echo "$tested:"
         phpunit -c $testdir/phpunit.xml $testdir/$tested
-        let "result = $result || $?"
+        result=$(($result || $?))
 done
 
-exit $result
+exit $result