Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer ... Conflicts: airtime_mvc/public/index.php		2015-06-16 10:37:06 -04:00
..
api_clients	CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime	2015-01-27 18:43:36 -05:00
icecast2	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
media-monitor	Debian/Ubuntu require a force-reload option for sysvinit scripts	2015-02-24 14:57:28 +00:00
pypo	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
std_err_override	CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime	2015-01-27 18:43:36 -05:00