]> granicus.if.org Git - php/commitdiff
Merge commit '626d96a'
authorRasmus Lerdorf <rasmus@php.net>
Sat, 3 Aug 2013 16:15:28 +0000 (12:15 -0400)
committerRasmus Lerdorf <rasmus@php.net>
Sat, 3 Aug 2013 16:15:28 +0000 (12:15 -0400)
* commit '626d96a':
  This doesn't fail in 5.5 anymore


Trivial merge