diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:27:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:27:41 +0400 |
| commit | c737b89473df9dba6742b8fc8fbf6d009bf05c36 (patch) | |
| tree | 5d067fae4757d65bd66f57bab59c1a0dec0dc56c /ext/mysqlnd/mysqlnd_alloc.c | |
| parent | 021f57ef0e21868f6bbef34c4b1a1a2bf5461159 (diff) | |
| parent | 8e76d0404b7f664ee6719fd98f0483f0ac4669d6 (diff) | |
| download | php-git-c737b89473df9dba6742b8fc8fbf6d009bf05c36.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed external entity loading
Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h
Diffstat (limited to 'ext/mysqlnd/mysqlnd_alloc.c')
0 files changed, 0 insertions, 0 deletions