]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
authorBartek Przybylski <bart.p.pl@gmail.com>
Sun, 25 Sep 2011 20:32:16 +0000 (22:32 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Sun, 25 Sep 2011 20:32:16 +0000 (22:32 +0200)

Trivial merge