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


Trivial merge