From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon, 4 Jan 2016 13:34:59 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1272c5babe8959a8971cd950d5f3784f9a988e02;p=civicrm-core.git

Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
---

1272c5babe8959a8971cd950d5f3784f9a988e02