Martin Konecny c19b7f7c6e Merge branch '1.9.1' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

2011-11-14 21:19:56 -05:00

..

api_clients

1.9.5 preparations

2011-11-02 15:19: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-11-14 21:19:56 -05:00

monit

CC-2978: Install fails on Ubuntu 11.10

2011-11-10 14:42:46 -05:00

pypo

CC-3040: Debian Squeeze requires the Liquidsoap natty binary instead of the generic one

2011-11-14 14:12:12 -05:00

python-virtualenv

Merge branch '1.9.1' into devel

2011-11-14 21:19:56 -05:00

show-recorder

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-11-01 22:43:12 -04:00

create-pypo-user.py

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-11-01 15:21:09 -04:00

remove-pypo-user.py

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

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