From: Michael Wallner <mike@php.net>
Date: Mon, 30 Dec 2013 13:32:25 +0000 (+0100)
Subject: This should be an empty merge.
X-Git-Tag: PRE_PHPNG_MERGE~353^2~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79d1c70e992d686fcb374ba2fba647e9a1136615;p=php

This should be an empty merge.

Merge branch 'PHP-5.6'

* PHP-5.6:
  update php.ini-*
  Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
  add 'never'
  fix type
  fix type; add tests for -1
  s/BOOLEAN/ENTRY/
  re-introduce always_populate_raw_post_data
---

79d1c70e992d686fcb374ba2fba647e9a1136615