From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 27 Jul 2010 22:16:56 +0000 (+0200)
Subject: Merge commit 'refs/merge-requests/31' of git://gitorious.org/owncloud/owncloud into... 
X-Git-Tag: v3.0~332
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=687cb29c7d9356811dd9d420873b375a3a03df89;p=nextcloud-server.git

Merge commit 'refs/merge-requests/31' of git://gitorious.org/owncloud/owncloud into merge
---

687cb29c7d9356811dd9d420873b375a3a03df89
diff --cc inc/lib_base.php
index 2e207735361,d0b25834421..aae9048f09b
mode 100644,100755..100644
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
diff --cc inc/lib_user.php
index 5fbde168ace,1d0cb86c6a7..1d0cb86c6a7
mode 100644,100755..100644
--- a/inc/lib_user.php
+++ b/inc/lib_user.php