diff options
author | Felipe Pena <felipensp@gmail.com> | 2014-05-11 09:46:25 -0300 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2014-05-11 09:46:25 -0300 |
commit | b99862e7ae4336c5bdb20514f845e63c6c1b43f6 (patch) | |
tree | 713a8b89cb7a49da3a09b1eabd4ab4c6e28ba6b5 /ext/mbstring/php_mbregex.c | |
parent | 16b293de506533805765a8617f2edf63a6b3c2e2 (diff) | |
parent | fb3b8de98deb03f4d9d6ee8745df4fa221bbd78e (diff) | |
download | php-git-b99862e7ae4336c5bdb20514f845e63c6c1b43f6.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions