]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorULF WENDEL <uw@php.net>
Thu, 10 Jan 2013 13:53:46 +0000 (14:53 +0100)
committerULF WENDEL <uw@php.net>
Thu, 10 Jan 2013 13:53:46 +0000 (14:53 +0100)
commitf787e21ef5fdcd1a2ec94bc341ba48a83c743e32
tree7c346bebfaa4d909fe8770d8b4f176a8a337308c
parentb3a934bdb317845c56247b55db4212ffc4171942
parent36e88d78e6eb471acaf43bd2229891670a0d44a1
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  MySQL 5.6 EXPIRE PASSWORD flag tests
ext/mysqli/tests/mysqli_constants.phpt