Merge pull request #2476 from davecivicrm/CRM-14169b
authordlobo <lobo@civicrm.org>
Wed, 5 Feb 2014 19:49:48 +0000 (11:49 -0800)
committerdlobo <lobo@civicrm.org>
Wed, 5 Feb 2014 19:49:48 +0000 (11:49 -0800)
Crm 14169b


Trivial merge