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

.gitignore

apps/contacts/lib/vcard.php

apps/files_imageviewer/appinfo/app.php

apps/files_imageviewer/css/jquery.fancybox-1.3.4.css

apps/files_imageviewer/css/lightbox.css

apps/files_imageviewer/img/blank.gif

apps/files_imageviewer/img/fancy_close.png

apps/files_imageviewer/img/fancy_loading.png

apps/files_imageviewer/img/fancy_nav_left.png

apps/files_imageviewer/img/fancy_nav_right.png

apps/files_imageviewer/img/fancy_shadow_e.png

apps/files_imageviewer/img/fancy_shadow_n.png

apps/files_imageviewer/img/fancy_shadow_ne.png

apps/files_imageviewer/img/fancy_shadow_nw.png

apps/files_imageviewer/img/fancy_shadow_s.png

apps/files_imageviewer/img/fancy_shadow_se.png

apps/files_imageviewer/img/fancy_shadow_sw.png

apps/files_imageviewer/img/fancy_shadow_w.png

apps/files_imageviewer/img/fancy_title_left.png

apps/files_imageviewer/img/fancy_title_main.png