]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d52dbd5 b5283b9)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Mon, 16 Sep 2013 17:21:22 +0000 (10:21 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 16 Sep 2013 17:21:22 +0000 (10:21 -0700)
# By Xinchen Hui (2) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  double test timeout for travis
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.