drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/controllers/PluploadController.php airtime_mvc/application/views/scripts/plupload/index.phtml		2014-10-08 11:46:08 -04:00
..
index.phtml	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-10-08 11:46:08 -04:00
upload.phtml	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00