Albert Santoni 24d842c4a6 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/controllers/LoginController.php airtime_mvc/application/controllers/plugins/Acl_plugin.php airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po		2014-06-23 15:26:53 -04:00
..
Acl_plugin.php	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-06-23 15:26:53 -04:00
Maintenance.php	CC-5802: Upgrade application.ini file	2014-04-28 09:43:21 -04:00
RabbitMqPlugin.php	increase mem warning limit to 30MB	2012-09-12 15:44:26 -04:00