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

.htaccess

3rdparty/Sabre/DAV/Server.php

apps/admin_dependencies_chk/settings.php

apps/calendar/appinfo/app.php

apps/calendar/appinfo/remote.php

apps/calendar/js/calendar.js

apps/calendar/share.php

apps/calendar/templates/calendar.php

apps/calendar/templates/settings.php

apps/calendar/templates/share.dropdown.php

apps/contacts/appinfo/app.php

apps/contacts/appinfo/remote.php

apps/contacts/js/contacts.js

apps/contacts/templates/index.php

apps/contacts/templates/settings.php

apps/files/appinfo/app.php

apps/files/appinfo/remote.php

apps/files/index.php

apps/files_sharing/ajax/getitem.php

apps/files_sharing/ajax/share.php