]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
authorJörn Friedrich Dreyer <jfd@butonic.de>
Fri, 24 Aug 2012 22:06:20 +0000 (00:06 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Fri, 24 Aug 2012 22:06:20 +0000 (00:06 +0200)

Trivial merge