]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
authorBart Visscher <bartv@thisnet.nl>
Thu, 3 May 2012 21:26:43 +0000 (23:26 +0200)
committerBart Visscher <bartv@thisnet.nl>
Thu, 3 May 2012 21:26:43 +0000 (23:26 +0200)

Trivial merge