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
..
airtime.mo	updated translation resources	2014-06-23 12:32:13 +00:00
airtime.po	updated translation resources	2014-06-23 12:32:13 +00:00