]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorLior Kaplan <kaplanlior@gmail.com>
Mon, 8 Feb 2016 18:29:24 +0000 (20:29 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Mon, 8 Feb 2016 18:29:24 +0000 (20:29 +0200)
commitfb7d673ef2142f3d11a190b2ce64133728a950af
tree94003292402371f6e8bd015825930227f138901b
parent3ef57f8d5d1ca853aebbc873b6bf18dbdcc197da
parent6772fbff621e7f39cea9ad7e90ec9380abe100a6
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
Makefile.global
sapi/fpm/Makefile.frag