com web/php: Merge branch 'master' of git.php.net:/web/php: archive/entries/2013-04-11-2.xml
| From: | Johannes Schlüter | Date: | Thu, 11 Apr 2013 11:01:56 +0000 |
| Subject: | com web/php: Merge branch 'master' of git.php.net:/web/php: archive/entries/2013-04-11-2.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-15760@lists.php.net to get a copy of this message | ||
Commit: e3240178955b378030087219d14fe84f774ba305
Author: Johannes Schlüter <johannes@schlueters.de> Thu, 11 Apr 2013 13:01:56 +0200
Parents: 3b68deb125333eead5d25cf5554e120d9fb6a8c4 5740839d77ea08b2e40fa4e8db2d482473f9e636
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=e3240178955b378030087219d14fe84f774ba305
Log:
Merge branch 'master' of git.php.net:/web/php
Conflicts:
archive/entries/2013-04-11-1.xml
Changed paths:
AA archive/entries/2013-04-11-2.xml
Diff:
diff --cc archive/entries/2013-04-11-2.xml
index 0000000,0000000..7ace606
new file mode 100644
--- /dev/null
+++ b/archive/entries/2013-04-11-2.xml
@@@ -1,0 -1,0 +1,20 @@@
++<?xml version="1.0" encoding="utf-8"?>
++<entry xmlns="http://www.w3.org/2005/Atom">
++ <title>PHP 5.4.14 and PHP 5.3.24 released!</title>
++ <id>http://php.net/archive/2013.php#id2013-04-11-1</id>
++ <published>2013-04-11T10:16:06+00:00</published>
++ <updated>2013-04-11T10:16:06+00:00</updated>
++ <category term="frontpage" label="PHP.net frontpage news"/>
++ <category term="releases" label="New PHP release"/>
++ <link href="http://php.net/index.php#id2013-04-11-1"
rel="alternate" type="text/html"/>
++ <link href="http://php.net/archive/2013.php#id2013-04-11-1"
rel="via" type="text/html"/>
++ <content type="xhtml">
++ <div xmlns="http://www.w3.org/1999/xhtml">
++ <p>The PHP development team announces the immediate availability of PHP 5.4..14 and PHP
5.3.24. These releases fix about 10 bugs aswell as upgrading the bundled PCRE library. All users of
PHP are encouraged to upgrade to PHP 5..4.14.</p>
++
++ <p>For source downloads of PHP 5.4.14 and PHP 5.3.24 please visit our <a
href="/downloads.php">downloads page</a>, Windows binaries can be found on <a
href="http://windows.php.net/download/">windows.php.net/download/</a>.</p>
++
++ <p>The list of changes are recorded in the <a
href="/ChangeLog-5.php">ChangeLog</a>.</p>
++ </div>
++ </content>
++</entry>