]> granicus.if.org Git - php/commitdiff
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)
* 'master' of https://git.php.net/repository/php-src:
  Update UPGRADING and make typo fixes to OCI8 package.xml


Trivial merge