]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorLars Strojny <lstrojny@php.net>
Wed, 30 Jan 2013 23:33:46 +0000 (00:33 +0100)
committerLars Strojny <lstrojny@php.net>
Wed, 30 Jan 2013 23:33:46 +0000 (00:33 +0100)
commit6b48a86a179a741da9f468e3a54994f7ee4ea211
tree08628534a9356c4ef9f3796bbf6f2f9d7c370dfd
parent8b972efe5f3e9d4e33d6e0193f3d56716a6cc59f
parent836a2b1131dd007edad24d921dbdf42a8ac10e32
Merge branch 'PHP-5.4' into PHP-5.5
ext/openssl/xp_ssl.c