]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorLukas Reschke <lukas@statuscode.ch>
Mon, 2 Jul 2012 08:25:53 +0000 (10:25 +0200)
committerLukas Reschke <lukas@statuscode.ch>
Mon, 2 Jul 2012 08:25:53 +0000 (10:25 +0200)

Trivial merge