]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 28 May 2015 00:09:46 +0000 (02:09 +0200)
committerFerenc Kovacs <tyrael@php.net>
Thu, 28 May 2015 00:09:46 +0000 (02:09 +0200)
* PHP-5.6:
  empty commit to trigger a github mirror


Trivial merge