]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'sabredav'
authorJakob Sack <kde@jakobsack.de>
Fri, 22 Jul 2011 21:18:08 +0000 (23:18 +0200)
committerJakob Sack <kde@jakobsack.de>
Fri, 22 Jul 2011 21:18:08 +0000 (23:18 +0200)

Trivial merge