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

apps/calendar/appinfo/info.xml

apps/contacts/appinfo/info.xml

apps/files_imageviewer/appinfo/info.xml

apps/files_sharing/appinfo/info.xml

apps/files_textviewer/appinfo/info.xml

apps/media/appinfo/info.xml

apps/user_openid/appinfo/info.xml

lib/installer.php

lib/setup.php