]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into movable_apps
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 25 Apr 2012 07:23:01 +0000 (09:23 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 25 Apr 2012 07:23:01 +0000 (09:23 +0200)

Trivial merge