From: Anatol Belski <ab@php.net>
Date: Mon, 15 Dec 2014 12:57:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f62ad3bc578eb7a5494b7816f31dc31227483aed;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  made the apache ini holders to be zend_bool
  Removed useless local variable
  Use simpler functions
  Fixed test
  small fixes to UPGRADING
  Reorder to save alignment size (of course, only for common used structs)
---

f62ad3bc578eb7a5494b7816f31dc31227483aed