James 9eb21cb327 Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/models/Preference.php install_minimal/include/airtime-db-install.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py		2011-08-24 10:30:59 -04:00
..
apache	CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime	2011-08-22 12:03:09 -04:00
ubuntu	-remove unneeded -dev packages from install	2011-08-17 15:50:28 -04:00