Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api ... Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php		2012-07-25 17:08:18 -04:00
..
album.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
artist.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
song.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00