From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 5 Feb 2013 10:09:38 +0000 (+0100)
Subject: Merge branch 'master' into fix_addNavigation
X-Git-Tag: v5.0.0alpha1~116^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4059959c5f72b010acaae0493a2977f9ea465e3d;p=nextcloud-server.git

Merge branch 'master' into fix_addNavigation
---

4059959c5f72b010acaae0493a2977f9ea465e3d