]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Tue, 9 Oct 2012 05:52:03 +0000 (22:52 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 9 Oct 2012 05:52:03 +0000 (22:52 -0700)
* 'master' 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)


Trivial merge