]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 13 Sep 2013 23:21:28 +0000 (16:21 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 13 Sep 2013 23:21:28 +0000 (16:21 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Remove some more unnecessary macros from phar
  Remove PHAR_(Z)STR* usages
  Remove version checks in phar


Trivial merge