Martin Konecny 0ae1b9fea6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/common/Database.php		2012-09-05 17:45:13 -04:00
..
application	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-05 17:45:13 -04:00
build	CC-4199: Webstream: Please show warning when the URL is too long	2012-09-04 16:18:18 -04:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
public	allow Airtime environment to be accessed from CLI	2012-09-05 17:34:12 -04:00
tests	…