Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Tue, 9 Oct 2012 05:51:58 +0000 (22:51 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 9 Oct 2012 05:51:58 +0000 (22:51 -0700)
commitbef8ff4c7bb426dee1c424fed12ecca44210f63f
treed43f1db77088eedc669c2027e80355f7cdfa06f9
parent91169fb24fa2c63d6cbab226a02d5fef277ea11b
parente4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed bug #63236 (Executable permission on various source files)
  Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)