]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMatteo Beccati <mbeccati@php.net>
Fri, 19 Jul 2013 07:39:53 +0000 (09:39 +0200)
committerMatteo Beccati <mbeccati@php.net>
Fri, 19 Jul 2013 07:39:53 +0000 (09:39 +0200)
commit1dc7d0da083ff77f02957ffdff9f4e8e7e3cf477
tree45e240b9c74ede9b4983d48d7165ddd3322047f5
parent99afc6dc11016be47ce2ba09779ae4a34d435f5b
parent2b9d42433f8e634593c2306d5d0ef61cc44281bf
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Properly fixed bug #63186 on NetBSD == 6.0