Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 20:08:11 +0000 (22:08 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 20:08:11 +0000 (22:08 +0200)
commitfaab4301417517c2c83910101a37a9ed53eb57e1
tree5763ab91b046140e7c88704d71455f6068b5d915
parent2d9399af3514189375f34610acc33a34de44d772
parent0a41af216ecabf76b54a78783b7cac01ca353ef9
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  test fixes