...
Merge branch 'assert' of http://github.com/krakjoe/php-src into assert_strings