granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

author	Stanislav Malyshev <stas@php.net>
	Sun, 26 Jan 2014 06:01:15 +0000 (22:01 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Sun, 26 Jan 2014 06:04:28 +0000 (22:04 -0800)
commit	6fca805b3b8fefd7817da6ec08bdfa018f7acfb0
tree	4531d25f1f42da1b26b476ddf23b2e693f606d4b	tree \| snapshot
parent	93ede745bce93c27432a6330078980e7ed3dad70	commit \| diff
parent	0742de587a919aefed2346c0c6e4784b71503d36	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Implement ldap_modify_batch.

Conflicts:
ext/ldap/ldap.c

Unnamed repository; edit this file 'description' to name the repository.