Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po		2014-04-23 15:58:39 -04:00
..
airtime_analyzer	Remove python-magic	2014-04-23 14:20:48 -04:00
api_clients	SAAS-404: Separate the Airtime API version from the Airtime version	2014-02-14 16:22:15 -05:00
icecast2	remove \r line endings	2012-10-30 13:23:09 -04:00
media-monitor	CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install	2013-05-27 13:41:36 -04:00
media-monitor2	CC-5679: Media Monitor: Uploading folder with tracks will erase organize folder itself	2014-01-31 13:20:10 -05:00
monit	CC-3520: Change default password of monit	2012-04-01 00:20:47 -04:00
pypo	cc-5747 Replaygain: doesnt work for aac tracks	2014-03-20 13:02:37 -04:00
python-virtualenv	CC-5328 Fix virtualenv version check for newer distros	2013-09-25 13:03:35 +01: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