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

apps/bookmarks/js/bookmarks.js

apps/files_pdfviewer/js/pdfjs/build/pdf.js

apps/files_pdfviewer/js/pdfjs/src/bidi.js

apps/files_pdfviewer/js/pdfjs/src/canvas.js

apps/files_pdfviewer/js/pdfjs/src/charsets.js

apps/files_pdfviewer/js/pdfjs/src/cidmaps.js

apps/files_pdfviewer/js/pdfjs/src/colorspace.js

apps/files_pdfviewer/js/pdfjs/src/core.js

apps/files_pdfviewer/js/pdfjs/src/crypto.js

apps/files_pdfviewer/js/pdfjs/src/evaluator.js

apps/files_pdfviewer/js/pdfjs/src/fonts.js

apps/files_pdfviewer/js/pdfjs/src/function.js

apps/files_pdfviewer/js/pdfjs/src/glyphlist.js

apps/files_pdfviewer/js/pdfjs/src/image.js

apps/files_pdfviewer/js/pdfjs/src/jpx.js

apps/files_pdfviewer/js/pdfjs/src/metadata.js

apps/files_pdfviewer/js/pdfjs/src/metrics.js

apps/files_pdfviewer/js/pdfjs/src/obj.js

apps/files_pdfviewer/js/pdfjs/src/parser.js

apps/files_pdfviewer/js/pdfjs/src/pattern.js