]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorBartek Przybylski <bart.p.pl@gmail.com>
Fri, 30 Dec 2011 16:06:48 +0000 (17:06 +0100)
committerBartek Przybylski <bart.p.pl@gmail.com>
Fri, 30 Dec 2011 16:06:48 +0000 (17:06 +0100)

Trivial merge