Martin Konecny b0eda6e915 Merge branch '2.4.x' ...

Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
	python_apps/pypo/pypocli.py
	python_apps/pypo/schedule/telnetliquidsoap.py

2013-05-22 12:07:08 -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

CC-3520: Change default password of monit

2012-04-01 00:20:47 -04:00

pypo

Merge branch '2.4.x'

2013-05-22 12:07:08 -04:00

python-virtualenv

CC-4989: upgrade to mutagen 1.21

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

std_err_override

Ensure only telnetliquidsoap has telnet responsibilities

2013-05-16 16:19:00 -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

…