diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-01-25 22:01:15 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-01-25 22:04:28 -0800 |
| commit | 6fca805b3b8fefd7817da6ec08bdfa018f7acfb0 (patch) | |
| tree | 4531d25f1f42da1b26b476ddf23b2e693f606d4b /ext/dba/dba_dbm.c | |
| parent | 93ede745bce93c27432a6330078980e7ed3dad70 (diff) | |
| parent | 0742de587a919aefed2346c0c6e4784b71503d36 (diff) | |
| download | php-git-6fca805b3b8fefd7817da6ec08bdfa018f7acfb0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Implement ldap_modify_batch.
Conflicts:
ext/ldap/ldap.c
Diffstat (limited to 'ext/dba/dba_dbm.c')
0 files changed, 0 insertions, 0 deletions