Martin Konecny b474035d76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/common/DateHelper.php airtime_mvc/public/js/airtime/library/library.js		2012-11-30 18:01:02 -05:00
..
application	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-11-30 18:01:02 -05:00
build	CC-1960: Internationalize Airtime / Support translations	2012-11-29 18:21:03 -05:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	CC-1960: Internationalize Airtime / Support translations	2012-11-29 11:47:11 -05:00
public	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-11-30 18:01:02 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00