Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:46:43 +0000 (09:46 -0800)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:46:43 +0000 (09:46 -0800)
* PHP-5.4:
  Fix broken test


Trivial merge