Permalink
Browse files

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

  • Loading branch information...
2 parents 6918b70 + db10bdb commit ea933fc58ceb21efd4c873b04e5a30ee84e3a998 @lorenzo lorenzo committed Feb 20, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 build.xml
View
6 build.xml
@@ -111,12 +111,12 @@
<name>CakePHP</name>
<summary>CakePHP Rapid Development Framework</summary>
<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="lorenzo" name="José Lorenzo Rodríguez" email="jose.zap@gmail.com" />
<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="Ceeram" name="Marc Ypes" email="c33ram@gmail.com" />
<developer user="jrbasso" name="Juan Basso" email="" />
@@ -129,7 +129,7 @@
<stability release="${pear.stability}" api="${pear.stability}" />
<notes>http://github.com/cakephp/cakephp/blob/master/README</notes>
<dependencies>
- <php minimum_version="5.2.6" />
+ <php minimum_version="5.2.8" />
<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" />
</dependencies>

0 comments on commit ea933fc

Please sign in to comment.