]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 30 Apr 2013 17:36:08 +0000 (19:36 +0200)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 30 Apr 2013 17:36:08 +0000 (19:36 +0200)
commit865cc3a8005ed82282f6c366c5d681160e52e221
tree640129720913e5c041fdd14a381135869073160d
parent062519ed4186d5f19a131a3a4c0e430a83dc0766
parent514afd67b651bea834bdb84b7685b48e9e56ac21
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64729: compilation failure on x32

Conflicts:
Zend/zend_alloc.c
Zend/zend_alloc.c
Zend/zend_multiply.h