]> granicus.if.org Git - php/commitdiff
This should be an empty merge.
authorMichael Wallner <mike@php.net>
Mon, 30 Dec 2013 13:32:25 +0000 (14:32 +0100)
committerMichael Wallner <mike@php.net>
Mon, 30 Dec 2013 13:32:25 +0000 (14:32 +0100)
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


Trivial merge