Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/forms/AddShowWhen.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/forms/SoundcloudPreferences.php airtime_mvc/application/forms/SupportSettings.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_email_server.phtml airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/schedule/add- show-form.phtml airtime_mvc/public/js/airtime/preferences/preferences.js python_apps/api_clients/api_client.py python_apps/pypo/listenerstat.py		2013-01-15 13:44:44 -05:00
..
application	Merge branch 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -05:00
build	CC-4807: Names of languages need to be localized	2013-01-11 14:44:14 -05:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Update Chinese translation files	2013-01-15 11:00:24 -05:00
public	Merge branch 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00