]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Sat, 19 Jul 2014 16:46:46 +0000 (18:46 +0200)
committerRemi Collet <remi@php.net>
Sat, 19 Jul 2014 16:46:46 +0000 (18:46 +0200)
commitd5d16b6278939c3471b13aaaa20b713e117939e3
treeb62e22b7e1dc2a987b5dfa6f86ff2941d3430fd9
parent1d2f232bd29dd29045c7389cf9d23b1ad2fd4db8
parenta051d7264dc5c21264e1244785d962ee1256874b
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
sapi/fpm/config.m4