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

apps/bookmarks/lib/search.php

apps/calendar/lib/search.php

apps/contacts/lib/search.php

apps/files_sharing/get.php

apps/files_sharing/js/share.js

apps/gallery/appinfo/app.php

apps/media/lib_media.php

apps/user_ldap/user_ldap.php

lib/app.php

lib/files.php

lib/filesystemview.php

lib/helper.php

lib/remote/cloud.php

lib/search.php

lib/search/provider.php

lib/search/provider/file.php

lib/user/database.php

lib/user/dummy.php

settings/ajax/disableapp.php

settings/ajax/enableapp.php