Merge branch 'R_1_1'
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:07:33 +0000 (11:07 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:07:33 +0000 (11:07 +0200)
commitb5bf65882debd5b1e96e08bcea688b3ae522cbeb
treea8d1d2d7bc62b14c4daee7e00a2683e7682ba273
parenta5a1d3a4fd8f9262cac759c3e658ff6129696b0d
parentf95a8b3dcd55596c7858c767a88d89cd5f7fe183
Merge branch 'R_1_1'