Merge branch 'master' of gitorious.org:owncloud/owncloud

apps/media/getID3/demos/demo.audioinfo.class.php

apps/media/getID3/demos/demo.basic.php

apps/media/getID3/demos/demo.browse.php

apps/media/getID3/demos/demo.cache.dbm.php

apps/media/getID3/demos/demo.cache.mysql.php

apps/media/getID3/demos/demo.joinmp3.php

apps/media/getID3/demos/demo.mimeonly.php

apps/media/getID3/demos/demo.mp3header.php

apps/media/getID3/demos/demo.mysql.php

apps/media/getID3/demos/demo.simple.php

apps/media/getID3/demos/demo.simple.write.php

apps/media/getID3/demos/demo.write.php

apps/media/getID3/demos/getid3.css

apps/media/getID3/demos/index.php

core/js/setup.js

index.php