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


Trivial merge