]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorKlaas Freitag <freitag@owncloud.com>
Mon, 14 May 2012 08:52:25 +0000 (10:52 +0200)
committerKlaas Freitag <freitag@owncloud.com>
Mon, 14 May 2012 08:52:25 +0000 (10:52 +0200)

Trivial merge