Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
..
2012-11-07 11:21:36 -05:00
2013-10-11 15:13:49 -04:00
2013-01-10 14:57:47 -05:00
2013-10-10 17:41:05 -04:00
2013-08-09 17:11:34 -04:00