2 Commits

Author	SHA1	Message	Date
Martin Konecny	c19b7f7c6e	Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/models/MusicDir.php install_full/ubuntu/airtime-full-install install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py	2011-11-14 21:19:56 -05:00
Martin Konecny	aa3460963f	CC-2929: More janitorial fixes for Debian/Ubuntu compatibility	2011-10-12 14:45:12 +02:00