Merge gitorious.org:owncloud/owncloud into tanghus_contacts

apps/calendar/js/calendar.js

apps/files_pdfviewer/js/viewer.js

apps/files_sharing/appinfo/app.php

apps/files_sharing/js/share.js

apps/files_sharing/lib_share.php

apps/files_sharing/sharedstorage.php

apps/files_texteditor/ajax/loadfile.php

apps/files_texteditor/ajax/savefile.php

apps/gallery/ajax/galleryOp.php

apps/gallery/ajax/thumbnail.php

apps/gallery/lib/photo.php

apps/gallery/lib/scanner.php

apps/media/ajax/api.php

apps/media/js/scanner.js

apps/media/lib_scanner.php

db_structure.xml

files/ajax/scan.php

files/ajax/upload.php

files/css/files.css

files/index.php