From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 30 Jul 2013 13:06:00 +0000 (+0200)
Subject: Merge branch 'stable5' into ldap_oracle_fixes
X-Git-Tag: v5.0.10~12^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cbb23154e8b100e6297e636b7204b907a8104080;p=nextcloud-server.git

Merge branch 'stable5' into ldap_oracle_fixes
---

cbb23154e8b100e6297e636b7204b907a8104080