From: k054 <kosa@riseup.net>
Date: Thu, 4 Feb 2016 22:27:14 +0000 (-0500)
Subject: Merge tag '4.6.12' of https://github.com/civicrm/civicrm-core into 4.6.12-fsf
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db64d3e10fed75ce096f6076e6cedaf31fa486a4;p=civicrm-core.git

Merge tag '4.6.12' of https://github.com/civicrm/civicrm-core into 4.6.12-fsf
---

db64d3e10fed75ce096f6076e6cedaf31fa486a4