]> granicus.if.org Git - php/commit
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)
commitb559cc98bab23c284dfe4604219d33d2f6cf4c6b
tree9822e5a4758f22c6b66b40dfd3402b71f7fde022
parentd29cc63bb681e426d93d69eb21941e2e9719a51f
parent3e1aabbfc3d9e07ad554a49e68d4f9f17b349f84
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed two errors in LDAP tests
  bump API version to 6.8
  bump API version to 6.8