From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 4 Oct 2013 10:27:18 +0000 (+0200)
Subject: Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into... 
X-Git-Tag: v6.0.0alpha2~101^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a223cf769a670c1c8926baf4ded445af300d056d;p=nextcloud-server.git

Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master

Conflicts:
	core/ajax/share.php
---

a223cf769a670c1c8926baf4ded445af300d056d