]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorWill Fitch <willf@aweber.com>
Fri, 24 Jan 2014 02:36:54 +0000 (21:36 -0500)
committerWill Fitch <willf@aweber.com>
Fri, 24 Jan 2014 02:36:54 +0000 (21:36 -0500)
* PHP-5.6:
  Update gitignore and Makefile for additional entries


Trivial merge