Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x ... Conflicts: python_apps/pypo/liquidsoap_scripts/ls_script.liq		2013-05-22 18:08:14 -04:00
..
application	Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x	2013-05-22 18:08:14 -04:00
build	CC-5156: Hungarian language is shown in strange font on login page	2013-05-17 11:05:38 -04:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Localization updates for fixes in CC-5166 and CC-5168	2013-05-22 10:55:14 +01:00
public	Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x	2013-05-22 18:08:14 -04:00
tests	test commit	2012-10-29 19:19:48 -04:00