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

..

3rd_party

Merge branch '1.9.1' into devel

2011-09-09 15:07:43 -04:00

patches/mutagen

…

airtime_virtual_env.pybundle

CC-2932: Recorder: When show is recorded, the file name is generated

2011-10-05 17:27:00 -04:00

virtualenv-install.sh

Merge branch '1.9.1' into devel

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