From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 30 Jan 2015 03:13:08 +0000 (+0300)
Subject: Merge branch 'master' into foreach
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=621fd74c01db58427ddd5cb399d15a8e36526e1b;p=php

Merge branch 'master' into foreach

* master:
  Fixed bug #68945 (Unknown admin values segfault pools)
  Add check for null pointer, as done in case 5 lines above.
  Fixed valgrind issue in mb_ereg_replace_variation1.phpt
  Remove excessive macros
  Use bash rather than sh
---

621fd74c01db58427ddd5cb399d15a8e36526e1b