From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 13 Sep 2013 18:57:18 +0000 (+0200)
Subject: Merge branch 'appframework-master' of github.com:owncloud/core into appframework... 
X-Git-Tag: v6.0.0alpha2~121^2~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4da8fc6907938bd7840131bfb51afddd35078b6d;p=nextcloud-server.git

Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
---

4da8fc6907938bd7840131bfb51afddd35078b6d