]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:/owncloud/owncloud
authorJörn Friedrich Dreyer <jfd@butonic.de>
Wed, 11 Jul 2012 00:34:28 +0000 (02:34 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Wed, 11 Jul 2012 00:34:28 +0000 (02:34 +0200)

Trivial merge