From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 24 Jan 2014 01:05:06 +0000 (-0800)
Subject: Merge pull request #2404 from davecivicrm/CRM-14119
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=181f2a469db8935cde97ca4c924467da3db607ca;p=civicrm-core.git

Merge pull request #2404 from davecivicrm/CRM-14119

CRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/240...
---

181f2a469db8935cde97ca4c924467da3db607ca