]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Tue, 23 Jun 2015 14:24:06 +0000 (16:24 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 23 Jun 2015 14:24:06 +0000 (16:24 +0200)
* PHP-5.6:
  Fixed two errors in LDAP tests
  bump API version to 6.8
  bump API version to 6.8


Trivial merge