]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into oc_preview
authorGeorg Ehrke <georg@ownCloud.com>
Sat, 25 May 2013 10:16:25 +0000 (12:16 +0200)
committerGeorg Ehrke <georg@ownCloud.com>
Sat, 25 May 2013 10:16:25 +0000 (12:16 +0200)

Trivial merge