]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:49:09 +0000 (09:49 -0800)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:49:09 +0000 (09:49 -0800)
commit7e01935dc2fe6bd6bf4b4625359edd7cd23d03f2
tree38df3606c421486bc06071a3bf36c297bb106ea6
parent90d4ae4da8f5a81e136cad26d9612a8f78d14f2d
parent6713f9c4b24b5be0d543f0f87cab0f401b0c41ed
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix broken test

Conflicts:
NEWS