Skip to content
Commit 077ea94f authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud 

Conflicts:
	apps/calendar/ajax/events.php
parents b62a8ba0 62da0bae
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment