]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 22:07:13 +0000 (00:07 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 22:07:13 +0000 (00:07 +0200)
commit9806a37a79f9e858c8ea54899942c9a681b98f29
tree0b4b5c242a78c6118670c582d21fca9f1e696460
parente70e2d8310b58a59dc14fa3336624cb022a5daaa
parent9991b8ecee3d8864abe6c05cec12278db1573767
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  sigh, can't even copypaste without screwing up