From: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Tue, 29 Mar 2016 05:07:04 +0000 (+0530)
Subject: Merge pull request #8031 from eileenmcnaughton/CRM-18307-trash
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f70098ac3560733c5e267a743d50e5b2fcdcd3e;p=civicrm-core.git

Merge pull request #8031 from eileenmcnaughton/CRM-18307-trash

CRM-18307 fix error on merge when undelete is off
---

1f70098ac3560733c5e267a743d50e5b2fcdcd3e