Merge pull request #860 from yashodha/CRM-12688
authordlobo <lobo@civicrm.org>
Sun, 26 May 2013 19:43:10 +0000 (12:43 -0700)
committerdlobo <lobo@civicrm.org>
Sun, 26 May 2013 19:43:10 +0000 (12:43 -0700)
CRM-12688


Trivial merge