]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 10:30:23 +0000 (11:30 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 10:30:23 +0000 (11:30 +0100)
commitbfbdc032b649860f724db9161bef8b761f3809c2
treeffd3d38a99e65a4be93de78825b22cb3b4b9f139
parent703154321fa72c1604b4fe8adefd899a34138800
parent561843c9731f976f15867a09b906132999c73039
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  typo spotted by Lajos Veres
Zend/zend_vm_gen.php