Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 9 Nov 2016 01:16:32 +0000 (02:16 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 9 Nov 2016 01:16:32 +0000 (02:16 +0100)

Trivial merge