Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel ...

Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py

2012-07-16 14:31:03 -04:00

..

api_clients

Merge branch '2.1.x' into devel

2012-07-16 14:31:03 -04:00

icecast2

CC-2886: changing file name

2011-09-29 15:45:04 -04:00

media-monitor

Merge branch '2.1.x' into devel

2012-07-16 14:31:03 -04:00

monit

CC-3520: Change default password of monit

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

pypo

Merge branch '2.1.x' into devel

2012-07-16 14:31:03 -04:00

python-virtualenv

CC-3736: Full Install fail at Ubuntu 12.04: virtualenv problem

2012-04-30 17:53:28 -04:00

std_err_override

CC-3691: Pypo needs to write stderr + stdout to the log file

2012-04-20 19:12:36 -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

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

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