]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Thu, 7 Aug 2014 09:25:05 +0000 (10:25 +0100)
committerDerick Rethans <github@derickrethans.nl>
Thu, 7 Aug 2014 09:25:05 +0000 (10:25 +0100)
commit3fd379e1964fff01eb2cd6d0ef3eb9fb72ce5160
tree1fd1bb24035bfa68a69a95cf3e51249d80338959
parent3b7c58ecd8157320eb467e3f3a585b766ea5dd93
parent33e9bb79a30823ebf398d1e2fc366ce34a1e1693
Merge branch 'PHP-5.6'

Not sure what's going wrong here for UPGRADING.INTERNALS...

Conflicts:
UPGRADING.INTERNALS