From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 22 Sep 2016 18:42:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'civi/4.7.12-rc'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cdd1a129f4ec22bdb84346446e983886ec761300;p=civicrm-core.git

Merge remote-tracking branch 'civi/4.7.12-rc'
---

cdd1a129f4ec22bdb84346446e983886ec761300