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

apps/files_sharing/sharedstorage.php

apps/gallery/templates/index.php

apps/user_ldap/settings.php

apps/user_ldap/templates/settings.php

apps/user_ldap/user_ldap.php

core/js/js.js

core/js/oc-dialogs.js

lib/base.php

lib/filestorage.php

lib/filestorage/common.php

lib/filestorage/commontest.php

lib/filestorage/google.php

lib/filestorage/local.php

lib/filesystem.php

lib/filesystemview.php

lib/helper.php

tests/lib/filestorage.php