Merge pull request #508 from dlobo/CRM-12274
authordlobo <lobo@civicrm.org>
Tue, 23 Apr 2013 15:50:59 +0000 (08:50 -0700)
committerdlobo <lobo@civicrm.org>
Tue, 23 Apr 2013 15:50:59 +0000 (08:50 -0700)
CRM-12274


Trivial merge