Merge remote-tracking branch 'origin/2.1' into 2.1

This commit is contained in:
Jose Lorenzo Rodriguez 2012-02-20 16:51:24 -04:30
commit ea933fc58c

View file

@ -111,12 +111,12 @@
<name>CakePHP</name> <name>CakePHP</name>
<summary>CakePHP Rapid Development Framework</summary> <summary>CakePHP Rapid Development Framework</summary>
<channel>pear.cakephp.org</channel> <channel>pear.cakephp.org</channel>
<description>CakePHP is a application development framework for PHP 5.2+</description> <description>CakePHP is an application development framework for PHP 5.2+</description>
<lead user="mark_story" name="Mark Story" email="mark@mark-story.com" /> <lead user="mark_story" name="Mark Story" email="mark@mark-story.com" />
<lead user="lorenzo" name="José Lorenzo Rodríguez" email="jose.zap@gmail.com" /> <lead user="lorenzo" name="José Lorenzo Rodríguez" email="jose.zap@gmail.com" />
<lead user="PhpNut" name="Larry Masters" email="phpnut@cakephp.org" /> <lead user="PhpNut" name="Larry Masters" email="phpnut@cakephp.org" />
<developer user="ADmad" name="" email="admad.coder@gmail.com" /> <developer user="ADmad" name="Adnan Sarela" email="admad.coder@gmail.com" />
<developer user="AD7six" name="Andy Dawson" email="andydawson76@gmail.com" /> <developer user="AD7six" name="Andy Dawson" email="andydawson76@gmail.com" />
<developer user="Ceeram" name="Marc Ypes" email="c33ram@gmail.com" /> <developer user="Ceeram" name="Marc Ypes" email="c33ram@gmail.com" />
<developer user="jrbasso" name="Juan Basso" email="" /> <developer user="jrbasso" name="Juan Basso" email="" />
@ -129,7 +129,7 @@
<stability release="${pear.stability}" api="${pear.stability}" /> <stability release="${pear.stability}" api="${pear.stability}" />
<notes>http://github.com/cakephp/cakephp/blob/master/README</notes> <notes>http://github.com/cakephp/cakephp/blob/master/README</notes>
<dependencies> <dependencies>
<php minimum_version="5.2.6" /> <php minimum_version="5.2.8" />
<pear minimum_version="1.9.0" recommended_version="1.9.4" /> <pear minimum_version="1.9.0" recommended_version="1.9.4" />
<package name="PHPUnit" channel="pear.phpunit.de" minimum_version="3.5.0" type="optional" /> <package name="PHPUnit" channel="pear.phpunit.de" minimum_version="3.5.0" type="optional" />
</dependencies> </dependencies>