]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorBjoern Schiessle <schiessle@owncloud.com>
Thu, 21 Jun 2012 08:29:08 +0000 (10:29 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Thu, 21 Jun 2012 08:29:08 +0000 (10:29 +0200)

Trivial merge