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
..
api_clients	- Version string change for 1.9.3	2011-08-25 17:02:56 -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-2726: create custom restart script for the Monit to use	2011-08-24 17:17:28 -04:00
pypo	Merge branch '1.9.1' into devel	2011-08-26 12:56:10 -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