]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorkrakjoe <joe.watkins@live.co.uk>
Sun, 2 Feb 2014 14:59:30 +0000 (14:59 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Sun, 2 Feb 2014 14:59:30 +0000 (14:59 +0000)
* PHP-5.6:
  another patch from upstream


Trivial merge