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

zendframework · May 9, 2012 · 15e6fba · 15e6fba
13 parents b348348 + 0640226 + 09868c6 + d3e357b + 50bd771 + 2595247 + aec938c + 5970dba + e723fba + f647c66 + e217698 + f887417 + d43c1be
commit 15e6fba
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