From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Wed, 19 Jun 2013 09:42:18 +0000 (-0700)
Subject: Merge pull request #3661 from owncloud/fixing-windows-server-master
X-Git-Tag: v6.0.0alpha2~615
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=904227a0e4b95be4f1a0aa87b9173fd2fea966c8;p=nextcloud-server.git

Merge pull request #3661 from owncloud/fixing-windows-server-master

Fixing windows server master
---

904227a0e4b95be4f1a0aa87b9173fd2fea966c8