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

3rdparty/when/When.php

apps/admin_dependencies_chk/settings.php

apps/admin_export/appinfo/info.xml

apps/calendar/ajax/activation.php

apps/calendar/ajax/choosecalendar.php

apps/calendar/ajax/daysofweekend.php

apps/calendar/ajax/deletecalendar.php

apps/calendar/ajax/deleteevent.php

apps/calendar/ajax/editcalendar.php

apps/calendar/ajax/editevent.php

apps/calendar/ajax/editeventform.php

apps/calendar/ajax/events.php

apps/calendar/ajax/firstdayofweek.php

apps/calendar/ajax/gettimezonedetection.php

apps/calendar/ajax/guesstimezone.php

apps/calendar/ajax/importdialog.php

apps/calendar/ajax/newcalendar.php

apps/calendar/ajax/newevent.php

apps/calendar/ajax/neweventform.php

apps/calendar/ajax/setdaysofweekend.php