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
..
airtime-2.2.0	…
airtime-2.2.1	…
airtime-2.3.0	…
airtime-2.3.1	…
airtime-2.4.0	…
airtime-2.4.1	adding upgrades to 2.4.1 for version.	2013-08-28 11:54:34 -04:00
airtime-2.5.0	CC-5420 : Upgrade: sql error	2013-10-15 15:33:13 -04:00
airtime-2.5.1	Update version number in airtime-constants.php	2013-12-09 15:30:30 -05:00
airtime-2.5.2/data	CC-5810 : Installation can have race conditions with the cache	2014-04-23 15:41:15 -04:00
airtime-2.5.3	CC-5781: Upgrade script for new storage quota implementation	2014-04-10 07:12:31 -04:00
upgrade-template	…