Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas ...

Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout

2013-05-21 16:40:10 -04:00

..

api_clients

remove some overly-verbose logging

2013-05-07 13:25:21 -04:00

icecast2

remove \r line endings

2012-10-30 13:23:09 -04:00

media-monitor

CC-5071:

2013-05-08 15:25:30 -04:00

media-monitor2

CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00

2013-05-15 13:19:29 -04:00

monit

monit alerts in saas

2013-04-04 16:30:39 -04:00

pypo

Merge branch '2.3.x-saas' into 2.4.x-saas

2013-05-21 16:40:10 -04:00

python-virtualenv

CC-4989: upgrade to mutagen 1.21

2013-03-01 14:58:26 -05:00

std_err_override

CC-3691: Pypo needs to write stderr + stdout to the log file

2012-04-20 19:12:36 -04:00

create-pypo-user.py

CC-3572: pypo user should have shell set to /bin/false

2012-03-31 22:11:12 -04:00

remove-pypo-user.py

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

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