]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8e5913 94140af)
Merge branch 'PHP-5.5' into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 17:21:32 +0000 (10:21 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 17:21:32 +0000 (10:21 -0700)
commit5939de35a8fc6b439c8a60db02a5181a386edaa0
tree00372a834427609051028ee7300e6d55abeb8d1btree | snapshot
parente8e5913e5e3500d2efee4a60fdfd77ab46fe2021commit | diff
parent94140afa69e334405688d3cb09a47c07aeaef825commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
configure.in
main/php_version.h
NEWS diff1 | diff2 | blob | history
ext/openssl/openssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.