]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fix_return_value_search_principals
authorGeorg Ehrke <developer@georgehrke.com>
Mon, 22 Jul 2013 13:30:57 +0000 (15:30 +0200)
committerGeorg Ehrke <developer@georgehrke.com>
Mon, 22 Jul 2013 13:30:57 +0000 (15:30 +0200)

Trivial merge