From: Côme BERNIGAUD <come.bernigaud@laposte.net>
Date: Thu, 25 Aug 2011 07:07:02 +0000 (+0200)
Subject: Merge branch 'master' of git://anongit.kde.org/owncloud
X-Git-Tag: v3.0~267^2~37^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df560b3d9d513e7b01c95745ae70a2151c2375fc;p=nextcloud-server.git

Merge branch 'master' of git://anongit.kde.org/owncloud

Conflicts:
	apps/media/js/collection.js
---

df560b3d9d513e7b01c95745ae70a2151c2375fc