Merge pull request #730 from dlobo/CRM-12600
authordlobo <lobo@civicrm.org>
Tue, 14 May 2013 18:11:27 +0000 (11:11 -0700)
committerdlobo <lobo@civicrm.org>
Tue, 14 May 2013 18:11:27 +0000 (11:11 -0700)
CRM-12600


Trivial merge