Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 13:05:59 +0000 (15:05 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 13:06:40 +0000 (15:06 +0200)
1  2 
package.xml

diff --cc package.xml
Simple merge