summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-03-03 13:20:57 -0800
committerStanislav Malyshev <stas@php.net>2013-03-03 13:20:57 -0800
commit2578f7bcc05c3a304599e978df3900323d3b1b70 (patch)
tree4d73df774a0adac1f270c4e99223b7edbd23ff08
parentd95faef1a10df8db5ce622d6495733495d562430 (diff)
parent656fcb67f1edbd2bde1b93577cdc273ad27e0d8f (diff)
downloadphp-git-2578f7bcc05c3a304599e978df3900323d3b1b70.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: rename NEWS back updated NEWS
-rw-r--r--NEWS (renamed from NEWS-5.4)0
1 files changed, 0 insertions, 0 deletions
diff --git a/NEWS-5.4 b/NEWS
index 36f6f9a439..36f6f9a439 100644
--- a/NEWS-5.4
+++ b/NEWS