]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorFelipe Pena <felipensp@gmail.com>
Tue, 21 Aug 2012 23:15:48 +0000 (20:15 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 21 Aug 2012 23:15:48 +0000 (20:15 -0300)
commitb0dbf714666516ac191bcc5f31498352ffbcb13c
treecaffa4d81d0264ee255d7b36357c60fea6c7e598
parentcd34067aecdd98e513f20d804f8fb1d278c9729a
parent85fa4d7747b79852474928bcd201c40de86b0bec
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Removed PHP 6 checks
ext/phar/phar.c
ext/phar/phar_object.c
ext/phar/stream.c