Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:45:19 +0000 (09:45 +0200)
committerMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:45:19 +0000 (09:45 +0200)
commit43f53c0f481b58c3f7fa991cf1fb07346189f8df
tree666042d2bf87405ad01801c192d7773f1bf48280
parente06c08bbfab4933e79569513eb3218dab8c3d521
parentb2a39ddc36146ad0049169c38f7741f96d356029
Merge branch 'master' into phpng