]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Sun, 15 Jun 2014 21:06:15 +0000 (23:06 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 15 Jun 2014 21:06:15 +0000 (23:06 +0200)
commitf92143f740c06d4344e15fa2b310f1cc674be77c
tree898154584a1dbf20e08addde957440b1eb7e1f26
parent05d7facb403e224001635299a4f768d945661c22
parent1d802ad5e5f6e80eafe0b83f61eec01981402ddb
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
Zend/zend_compile.c
NEWS
Zend/zend_compile.c