]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorMichael Gapczynski <GapczynskiM@gmail.com>
Wed, 28 Dec 2011 17:48:08 +0000 (12:48 -0500)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Wed, 28 Dec 2011 17:48:08 +0000 (12:48 -0500)

Trivial merge