]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorWill Fitch <willf@aweber.com>
Fri, 24 Jan 2014 02:34:57 +0000 (21:34 -0500)
committerWill Fitch <willf@aweber.com>
Fri, 24 Jan 2014 02:34:57 +0000 (21:34 -0500)
commitc0acb9d5f6fc5b8cd1b389877deb2f9452b6ee0b
tree68166d3fd64c7f73be70611ecee320836c7597d7
parentc0fcd3d6b021ac1386d417aa129f76e458b5d769
parentc4c10a222e4358b1d9d28ef852e8a5d56709865d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update gitignore and Makefile for additional entries
.gitignore
Makefile.global