james 56ad8c6b3d Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/pypo/pypofetch.py		2011-08-26 12:56:10 -04:00
..
library	-updated liquidsoap scripts + library to be liquidsoap-beta2 compliant	2011-07-06 11:14:51 -04:00
liquidsoap.cfg	CC-2590: Make bitrate for liquidsoap adjustable, support multiple	2011-08-11 14:43:45 -04:00
ls_lib.liq	CC-2706: Streams should have a username field	2011-08-24 17:13:56 -04:00
ls_script.liq	Merge branch '1.9.1' into devel	2011-08-26 12:56:10 -04:00
notify.sh	-reorganized/cleaned up python_apps/pypo directory.	2011-06-14 14:37:09 -04:00