martin 5190a0c24c Merge branch '1.9.1' into devel ...

Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py

2011-10-04 13:59:27 -04:00

..

api_clients

Merge branch '1.9.1' into devel

2011-10-04 13:59:27 -04:00

icecast2

CC-2886: changing file name

2011-09-29 15:45:04 -04:00

media-monitor

Merge branch '1.9.1' into devel

2011-10-04 13:59:27 -04:00

monit

CC-2888: Create a monit file for each airtime component

2011-09-26 14:47:21 -04:00

pypo

CC-2925: Airtime scripts broken with Liquidsoap 1.0 pre-release

2011-10-04 13:50:03 -04:00

python-virtualenv

CC-2894: script exits if there is error

2011-09-28 15:59:13 -04:00

show-recorder

Merge branch '1.9.1' into devel

2011-10-04 13:59:27 -04:00

create-pypo-user.py

CC-2602 : Live show record silence

2011-07-27 13:00:07 +02:00

remove-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00