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

apps/calendar/appinfo/app.php

apps/calendar/lib/hooks.php

apps/calendar/templates/part.choosecalendar.rowfields.php

apps/contacts/ajax/chooseaddressbook.php

apps/contacts/appinfo/app.php

apps/contacts/lib/hooks.php

apps/contacts/templates/part.chooseaddressbook.rowfields.php

dav.php

files/ajax/upload.php

lib/helper.php