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

Trivial merge