james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ...

Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php

2011-06-20 18:09:37 -04:00

..

airtime-install.php

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -04:00

airtime-uninstall.php

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -04:00

airtime-upgrade.php

CC-2410: Clean up install process

2011-06-20 17:43:06 -04:00

AirtimeIni.php

CC-2410: Clean up install process

2011-06-20 17:38:18 -04:00

AirtimeInstall.php

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -04:00