James 9eb21cb327 Merge branch '1.9.1' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py

2011-08-24 10:30:59 -04:00

..

api_clients

CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime

2011-08-22 12:03:09 -04:00

media-monitor

CC-2717: Media Monitor forgets about watched directories after being restarted

2011-08-22 20:41:34 -04:00

monit

CC-2721: Pypo doesn't restart when it gets new stream setting

2011-08-23 11:13:06 -04:00

pypo

CC-2721: Pypo doesn't restart when it gets new stream setting

2011-08-23 11:13:06 -04:00

python-virtualenv

cc-2666: separate components

2011-08-23 12:43:50 -04:00

show-recorder

cc-2683: not using utc time

2011-08-16 16:49:35 -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