]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of kde:owncloud
authorBartek Przybylski <bart.p.pl@gmail.com>
Mon, 22 Aug 2011 17:33:32 +0000 (19:33 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Mon, 22 Aug 2011 17:33:32 +0000 (19:33 +0200)

Trivial merge