From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 26 Aug 2011 18:00:10 +0000 (-0400)
Subject: Merge branch 'master' of git://anongit.kde.org/owncloud
X-Git-Tag: v3.0~267^2~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=85431914069f1a773a64390b924668c865087b08;p=nextcloud-server.git

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

85431914069f1a773a64390b924668c865087b08