Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2 ... Conflicts: python_apps/api_clients/api_client.py		2012-07-16 17:41:36 -04:00
..
DoctrineMigrations	Merge branch '2.1.x' into devel	2012-06-29 10:57:14 -04:00
include	CC-4104: airtime-uninstall should not purge airtime database be default	2012-07-16 14:18:40 -04:00
upgrades	CC-430: Audio normalization (Replaygain Support)	2012-07-15 22:22:42 -04:00
airtime-dircheck.php	CC-2518: Auto install script for manual install	2011-07-19 17:30:23 -04:00
airtime-install	CC-4104: airtime-uninstall should not purge airtime database be default	2012-07-16 15:43:17 -04:00
airtime-php.ini	CC-2819: Upgrade from 1.8.2 to 1.9.4-RC2 fails on Debian squeeze with 'Failed sql query'	2011-09-14 16:47:07 -04:00
airtime-uninstall	CC-4104: airtime-uninstall should not purge airtime database be default	2012-07-16 14:18:40 -04:00