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

.gitignore

COPYING-README

apps/bookmarks/addBm.php

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/editBookmark.php

apps/bookmarks/ajax/updateList.php

apps/bookmarks/appinfo/app.php

apps/bookmarks/appinfo/database.xml

apps/bookmarks/bookmarksHelper.php

apps/bookmarks/css/bookmarks.css

apps/bookmarks/js/addBm.js

apps/bookmarks/js/bookmarks.js

apps/bookmarks/settings.php

apps/bookmarks/templates/addBm.php

apps/bookmarks/templates/list.php

apps/bookmarks/templates/settings.php

apps/calendar/ajax/createcalendar.php

apps/calendar/ajax/getcal.php

apps/calendar/ajax/newcalendar.php

apps/calendar/ajax/updatecalendar.php