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

apps/calendar/ajax/duration.php

apps/calendar/ajax/moveevent.php

apps/calendar/ajax/neweventform.php

apps/calendar/ajax/setduration.php

apps/calendar/ajax/settimeformat.php

apps/calendar/ajax/timeformat.php

apps/calendar/export.php

apps/calendar/js/calendar.js

apps/calendar/js/settings.js

apps/calendar/templates/calendar.php

apps/calendar/templates/part.editevent.php

apps/calendar/templates/settings.php

lib/appconfig.php