From: Stanislav Malyshev <stas@php.net>
Date: Fri, 12 Jul 2013 17:53:47 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20e9ca5c9f7a214317441a45fddd63367c7f3c8b;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update 5.4.17 date
---

20e9ca5c9f7a214317441a45fddd63367c7f3c8b