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
..
2014-04-23 15:58:39 -04:00
2013-07-29 08:57:31 -04:00
2012-11-07 11:21:36 -05:00
2013-09-24 11:47:20 +02:00
2013-10-11 15:13:49 -04:00
2013-01-10 14:57:47 -05:00
2014-01-29 17:54:28 +00:00
2012-11-22 15:14:55 -05:00
2013-10-10 17:41:05 -04:00
2012-11-20 16:43:42 -05:00
2013-12-16 17:14:00 -05:00
2013-08-09 17:11:34 -04:00
2014-01-29 17:54:28 +00:00
2012-09-19 11:04:01 -04:00
2012-11-28 11:54:22 -05:00
2013-08-16 15:12:00 -04:00
2012-12-13 12:29:02 -05:00
2013-09-24 18:50:41 +02:00