Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

apps/calendar/ajax/event/edit.form.php

apps/calendar/js/calendar.js

apps/files_texteditor/css/style.css

apps/gallery/lib/managers.php

apps/gallery/lib/tiles.php

apps/gallery/templates/index.php

apps/media/lib_collection.php

apps/user_ldap/lib_ldap.php

apps/user_ldap/user_ldap.php

lib/connector/sabre/auth.php

lib/filecache.php

lib/installer.php

lib/util.php

settings/js/log.js

settings/templates/admin.php