denise 135aadf16b Merge branch '2.2.x' into devel ...

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js

2012-11-02 12:28:21 -04:00

..

api_clients

Removed unused method

2012-10-31 12:48:11 -04:00

icecast2

remove \r line endings

2012-10-30 13:23:09 -04:00

media-monitor

Merge branch '2.2.x'

2012-10-26 00:31:12 -04:00

media-monitor2

Merge branch '2.2.x' into devel

2012-11-02 12:28:21 -04:00

monit

CC-3520: Change default password of monit

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

pypo

Merge branch '2.2.x' into devel

2012-11-02 12:28:21 -04:00

python-virtualenv

Added gevent magic.

2012-10-22 12:14:36 -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