Merge pull request #214 from yashodha/CRM-12014
authorcolemanw <coleman@civicrm.org>
Thu, 21 Mar 2013 17:14:32 +0000 (10:14 -0700)
committercolemanw <coleman@civicrm.org>
Thu, 21 Mar 2013 17:14:32 +0000 (10:14 -0700)
CRM-12014


Trivial merge