Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 19 Sep 2014 18:15:56 +0000 (20:15 +0200)
committerAnatol Belski <ab@php.net>
Fri, 19 Sep 2014 18:15:56 +0000 (20:15 +0200)
commitf6c02239caa84b0cf0ed1ce3fecc87cd0008e413
treeba0072401f88d15a1dc5f325d060c298041b50ce
parentc343ca4efba7e600f7d20c73fde34dbda8192e48
parent6213d9fc91de457b08e574a0f1ac8073eb948b17
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix possible array underflow

Conflicts:
ext/standard/image.c
ext/standard/image.c