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

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/delBookmark.php

apps/bookmarks/ajax/editBookmark.php

apps/calendar/ajax/calendar/delete.php

apps/calendar/ajax/calendar/edit.php

apps/calendar/ajax/calendar/new.php

apps/calendar/ajax/calendar/update.php

apps/calendar/ajax/event/delete.php

apps/calendar/ajax/event/edit.php

apps/calendar/ajax/event/move.php

apps/calendar/ajax/event/new.php

apps/calendar/ajax/import/import.php

apps/calendar/ajax/settings/setfirstday.php

apps/calendar/ajax/settings/settimeformat.php

apps/calendar/ajax/share/changepermission.php

apps/calendar/ajax/share/share.php

apps/calendar/ajax/share/unshare.php

apps/calendar/appinfo/app.php

apps/calendar/lib/app.php

apps/calendar/lib/connector_sabre.php