]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into files_encryption
authorSam Tuke <samtuke@owncloud.com>
Wed, 6 Feb 2013 15:08:53 +0000 (15:08 +0000)
committerSam Tuke <samtuke@owncloud.com>
Wed, 6 Feb 2013 15:08:53 +0000 (15:08 +0000)

Trivial merge