Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel ... Conflicts: airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/models/StoredFile.php		2013-02-02 21:07:34 -05:00
..
application	Merge branch '2.3.x' into devel	2013-02-02 21:07:34 -05:00
build	CC-4904: Library -> Sort by status doesn't work	2013-02-01 17:47:07 -05:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Added Czech and Brazilian Portuguese language options	2013-01-21 14:56:27 -05:00
public	Merge branch '2.3.x' into devel	2013-02-02 21:07:34 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00