]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 21 Aug 2013 22:18:14 +0000 (00:18 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 21 Aug 2013 22:18:14 +0000 (00:18 +0200)

Trivial merge