Merge branch 'v1.1.x'
authorMichael Wallner <mike@php.net>
Thu, 3 Dec 2015 09:30:47 +0000 (10:30 +0100)
committerMichael Wallner <mike@php.net>
Thu, 3 Dec 2015 09:30:47 +0000 (10:30 +0100)
commita3193b716962b6be984a1b62823bafa771ab6354
tree086320025cb17fea280a7099d2411a8f95750bec
parentc8fc578c4a2cb9e71b508871e5e076aa40ca8e7f
parenteeae0a9e3902df12e85b6639c8d3356297957b59
Merge branch 'v1.1.x'