Merge pull request #2404 from davecivicrm/CRM-14119
authorDave Greenberg <dave@civicrm.org>
Fri, 24 Jan 2014 01:05:06 +0000 (17:05 -0800)
committerDave Greenberg <dave@civicrm.org>
Fri, 24 Jan 2014 01:05:06 +0000 (17:05 -0800)
commit181f2a469db8935cde97ca4c924467da3db607ca
tree6ae952d9ed1fbdc33367e177a3ba2ce87df361be
parent19d9e52e2519a5c77c4000b60e37b26c14dc9613
parent1efec7ffd2856e012955f53e67a46fc0a3cc99fd
Merge pull request #2404 from davecivicrm/CRM-14119

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