From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 28 Aug 2014 09:13:52 +0000 (+0400)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_REMOVALS~232^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4f2588513af3e4c03cc85c9652c47eb517a00f8;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix pg_last_notice()
  Changed 'unsigned size_t' to 'size_t'
  Fixed segfaults after change size_t of "s"
  Fixed zend extensions multipy-times loadable
  Revert "Fixed incompatible pointer type"
  fix hash_pbkdf2()
---

b4f2588513af3e4c03cc85c9652c47eb517a00f8