]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into movable_apps_2
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Apr 2012 19:27:22 +0000 (21:27 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Apr 2012 19:27:22 +0000 (21:27 +0200)

Trivial merge