]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorChristopher Jones <sixd@php.net>
Fri, 29 Aug 2014 15:48:43 +0000 (08:48 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 29 Aug 2014 15:48:43 +0000 (08:48 -0700)
commit6fe0bdda9cd5f3d041d48f74b253fb01e142942d
treeb793c1e1cb51d6ae04e75d0896529a0eb4071532
parent13b45a36f073df212408d47a595b25ac494e5af2
parent9063188fadae0e576bf51a1fd20a268e65e2656a
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove 550+ compile warnings on OS X