denise fc4ccb4798 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo		2013-01-04 17:21:46 -05:00
..
application	Removed bogus extra comma	2013-01-04 17:30:51 +00:00
build	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2013-01-03 18:00:33 -05:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2013-01-04 17:21:46 -05:00
public	CC-4734: French - UI breaks in several places	2013-01-04 17:19:09 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00