Martin Konecny 563f5b64d2 Merge branch '2.3.x' into devel ... Conflicts: debian/postinst		2013-04-02 12:31:48 -04:00
..
application	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2013-04-01 19:15:02 -04:00
build	Merge branch '2.3.x' into devel	2013-04-02 12:31:48 -04:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Added Austrian German localization, thanks Hoerich!	2013-04-02 17:06:16 +01:00
public	Merge branch '2.3.x' into devel	2013-03-06 13:46:01 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00