James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel ... Conflicts: airtime_mvc/application/Bootstrap.php		2013-01-14 16:19:51 -05:00
..
application	Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel	2013-01-14 16:19:51 -05:00
build	CC-4807: Names of languages need to be localized	2013-01-11 14:44:14 -05:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Update Chinese translation files	2013-01-14 10:39:10 -05:00
public	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2013-01-14 16:00:46 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00