]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 6 Nov 2013 09:46:34 +0000 (10:46 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 6 Nov 2013 09:46:34 +0000 (10:46 +0100)
commit91108818e1554ed542a13148e6d8b79e29e77935
tree5a7214613ac0da55f6b23c615e900332be31b9fb
parent9d75b9fb27cd93c19cd168a486ab2efe2ce2aa78
parent8b6b39fdcffc8486fedd391b8d8aa7700f0c7f93
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt