]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into oc_preview
authorGeorg Ehrke <georg@ownCloud.com>
Fri, 17 May 2013 09:41:30 +0000 (11:41 +0200)
committerGeorg Ehrke <georg@ownCloud.com>
Fri, 17 May 2013 09:41:30 +0000 (11:41 +0200)

Trivial merge