]> granicus.if.org Git - php/commit
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Thu, 25 Jul 2013 17:57:53 +0000 (10:57 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 25 Jul 2013 17:57:53 +0000 (10:57 -0700)
commitc67714b782258efd4be67c0a5a4a72a8c10a6c1c
tree5db1c14f149c58cc90a65d823f5c21f2ba3e15a3
parentb39f973c63e0b9819bea5e9b1d03472d65b7e94d
parentfe98ffc227df760a4f5a63fd2668f742e28eb4fb
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Update UPGRADING and make typo fixes to OCI8 package.xml