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

apps/bookmarks/appinfo/migrate.php

apps/calendar/js/loader.js

apps/contacts/ajax/contacts.php

apps/contacts/ajax/loadphoto.php

apps/contacts/appinfo/migrate.php

apps/contacts/css/contacts.css

apps/contacts/js/contacts.js

apps/contacts/lib/vcard.php

apps/contacts/templates/part.contact.php

apps/contacts/templates/part.contactphoto.php

apps/contacts/templates/part.contacts.php

apps/files_external/js/settings.js

apps/files_external/lib/amazons3.php

apps/files_external/personal.php

apps/files_external/settings.php

apps/files_external/templates/settings.php

apps/files_versions/ajax/getVersions.php

apps/files_versions/appinfo/app.php

apps/files_versions/versions.php

apps/gallery/lib/managers.php