Merge pull request #2100 from kenwest/CRM-13840
authorcolemanw <coleman@civicrm.org>
Tue, 26 Nov 2013 22:57:54 +0000 (14:57 -0800)
committercolemanw <coleman@civicrm.org>
Tue, 26 Nov 2013 22:57:54 +0000 (14:57 -0800)
CRM-13840


Trivial merge