Fix misuse of t()
Merge pull request #36 from colemanw/viewsFix

Fix misuse of t() in views
CRM-12836 : applied patch, working fine
Merge pull request #37 from pratik-joshi/CRM-12836

CRM-12836 : applied patch, working fine
Broken/missing handler fix for location type field for Phone and Email
Merge pull request #38 from monishdeb/CRM-12982

CRM-12982 fix
Merge remote-tracking branch 'upstream/7.x-4.3' into 7.x-4.3-7.x-master-2013-07-14-22-38-33