James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/controllers/PlaylistController.php		2012-08-23 10:43:28 -04:00
..
events	CC-4256: Smart Playlist: change name to smart block and etc	2012-08-20 17:17:48 -04:00
library.js	CC-4254: Library: advanced search on library	2012-08-23 10:41:40 -04:00
plupload.js	CC-3893: Add Media: Red underline appears on the bottom	2012-06-05 11:19:59 -04:00
spl.js	CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once	2012-08-22 13:58:13 -04:00