]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 721fc9e 56ab00b)
Merge branch 'master' into foreach
authorDmitry Stogov <dmitry@zend.com>
Fri, 30 Jan 2015 03:13:08 +0000 (06:13 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 30 Jan 2015 03:13:08 +0000 (06:13 +0300)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.