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

..

sql

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-04-23 15:58:39 -04:00

airtime-php.logrotate

CC-4119: zendphp.log is not rotated

2012-08-20 16:05:25 -04:00

airtime.conf

Changed default base directory in airtime.conf and api_client.cfg

2013-01-15 13:47:35 -05:00

build.properties

CC-5709: Airtime Analyzer

2014-03-21 14:03:17 -04:00

runtime-conf.xml

CC-5651: Unit Test the Scheduler

2014-01-13 11:43:17 -05:00

schema.xml

Changed default import_status value on cc_files table to 1 (pending)

2014-04-01 11:28:33 -04:00