Merge branch 'master' into 2.5

This commit is contained in:
mark_story 2013-12-14 17:45:49 -05:00
commit c2b8778ce8
29 changed files with 150 additions and 29 deletions

View file

@ -15,6 +15,7 @@
* @since CakePHP(tm) v 2.4
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('SyslogLog', 'Log/Engine');
/**

View file

@ -15,6 +15,7 @@
* @since CakePHP(tm) v 2.4
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('LogEngineCollection', 'Log');
App::uses('FileLog', 'Log/Engine');