martin 9236f4941d Merge branch 'master' of dev.sourcefabric.org:airtime into 1.8.1 ... Conflicts: VERSION airtime_mvc/application/configs/conf.php		2011-04-26 15:34:53 -04:00
..
AirtimeIni.php	reloading config after ini values are changed	2011-04-18 15:28:48 -04:00
AirtimeInstall.php	Merge branch 'master' of dev.sourcefabric.org:airtime into 1.8.1	2011-04-26 15:34:53 -04:00