]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0d8de4 58c6e05)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Wed, 18 Sep 2013 12:41:20 +0000 (05:41 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 18 Sep 2013 12:41:20 +0000 (05:41 -0700)
* 'master' of https://git.php.net/repository/php-src:
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix build - PRIu64 vs %I64u


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