]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'stable5' into sharing_fix_infinite_loop
authorBjoern Schiessle <schiessle@owncloud.com>
Wed, 23 Oct 2013 12:30:14 +0000 (14:30 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Wed, 23 Oct 2013 12:30:14 +0000 (14:30 +0200)

Trivial merge