]> granicus.if.org Git - php/commit
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 Jan 2015 18:09:20 +0000 (21:09 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 Jan 2015 18:09:20 +0000 (21:09 +0300)
commit12cbb9c156cfaef331f75076b8a3ef85797eacc2
treee17585cac282bbf12311f39c06680a4fe658025e
parentb476c2713531f6e576acd2513de47c37eea8006f
parent29688512b4579fc0f9dcd86587ce0e53855843d6
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  updated NEWS
  updated NEWS
  PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
  bump year
  bump year
  Bump year
Zend/zend_object_handlers.c
Zend/zend_opcode.c