From: Thomas Tanghus Date: Mon, 30 Jul 2012 10:28:40 +0000 (+0200) Subject: Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 X-Git-Tag: v4.0.6~17 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=01f25119d5e793d5bd400b492de5887cae9ba73b;p=nextcloud-server.git Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 --- 01f25119d5e793d5bd400b492de5887cae9ba73b