]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 23:34:47 +0000 (01:34 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 23:34:47 +0000 (01:34 +0200)
commitd1fb869e78bdac54c236d7650858ffb5edb8fec2
tree6ad00281a520e4564beca50eda153e30a61da928
parent19e5852ad8dd38480f008e82ae2dbbdd9e0ac11c
parent12885ef48902dcc622eafd771db1f3cc41cbbe6d
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0