]> granicus.if.org Git - php/commit
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)
commitb48f7e0c797d80a231f1b1436e349e44deba743d
tree690801b66197165959b290c0be0f0cf60a23f5e5
parentcadbec2fa07e2e0fda85ea59370ed64c934db68c
parent626d96ab6dc844071b0c86bb382e89713b33df14
Merge commit '626d96a'

* commit '626d96a':
  This doesn't fail in 5.5 anymore