From: Thomas Tanghus Date: Mon, 25 Jun 2012 14:22:19 +0000 (+0200) Subject: Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 X-Git-Tag: v4.0.4~9 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ddf321d5343151581d7df2fbc508c7af14c20fd6;p=nextcloud-server.git Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 --- ddf321d5343151581d7df2fbc508c7af14c20fd6