From: Thomas Tanghus Date: Mon, 16 Jul 2012 19:22:07 +0000 (+0200) Subject: Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 X-Git-Tag: v4.0.5~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=47d50fc424cb949903f33a8750625fc419a3520f;p=nextcloud-server.git Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 --- 47d50fc424cb949903f33a8750625fc419a3520f