]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge master into webdav-injection
authorRobin Appelman <icewind@owncloud.com>
Tue, 22 Apr 2014 10:25:49 +0000 (12:25 +0200)
committerRobin Appelman <icewind@owncloud.com>
Tue, 22 Apr 2014 10:25:49 +0000 (12:25 +0200)

Trivial merge