Merge pull request #4930 from colemanw/CRM-15817
authorcolemanw <coleman@civicrm.org>
Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)
committercolemanw <coleman@civicrm.org>
Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)
commit7b8d1e63a7914120975887eaa324302e6ad11f36
treeefb060d8e18acc2489d74f815f183e329520a8c5
parent67b3da5a77f9715caf3cdcf1b7b2e262dc5060a7
parentaa8694283672ed6493cde75e91296db6ac47c178
Merge pull request #4930 from colemanw/CRM-15817

CRM-15817 - Fix merge error