From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 5 Jan 2013 17:24:21 +0000 (-0500)
Subject: Merge branch 'master' into update-progress
X-Git-Tag: v5.0.0alpha1~258^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=035d0aa9d5b2768672af89ddd543913ec1f6b657;p=nextcloud-server.git

Merge branch 'master' into update-progress
---

035d0aa9d5b2768672af89ddd543913ec1f6b657
diff --cc lib/app.php
index 9d4ead71b90,30f76300365..e60bce2a201
mode 100755,100644..100644
--- a/lib/app.php
+++ b/lib/app.php