Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Thu, 3 Dec 2015 09:29:32 +0000 (10:29 +0100)
committerMichael Wallner <mike@php.net>
Thu, 3 Dec 2015 09:29:32 +0000 (10:29 +0100)
commitfdab445e81832006aa78396eee5832383e48db4d
treed7a3a80a2c17a75d7b471e44635621ddfebffd18
parent0e8c120d8476bb46f832b79e9f42468722d7d1ed
parentb93ff4841c117f7bdfc791a0bc692f3b0056a861
Merge branch 'v1.0.x'