From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 18 Jan 2016 19:37:40 +0000 (-0500)
Subject: Merge branch 'PalanteJon-CRM-17552-v2'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8f296cd88857e806e0f6af35a848e9c8a1312390;p=civicrm-core.git

Merge branch 'PalanteJon-CRM-17552-v2'

Conflicts:
	CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
---

8f296cd88857e806e0f6af35a848e9c8a1312390