From: kondou <kondou@ts.unde.re>
Date: Wed, 21 Aug 2013 17:20:25 +0000 (+0200)
Subject: Merge branch 'master' into improve_app-management
X-Git-Tag: v6.0.0alpha2~278^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ce35af02acb2fa9fe0ef401dc75345b5114e3d6;p=nextcloud-server.git

Merge branch 'master' into improve_app-management

Conflicts:
	settings/js/apps.js
---

0ce35af02acb2fa9fe0ef401dc75345b5114e3d6