Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233

CRM/Admin/Form/Setting/Mail.php

CRM/Admin/Form/WordReplacements.php

CRM/Case/BAO/Case.php

CRM/Contact/BAO/Contact.php

CRM/Contact/BAO/Group.php

CRM/Contact/Form/Contact.php

CRM/Contact/Form/Edit/TagsAndGroups.php

CRM/Contribute/BAO/Contribution.php

CRM/Core/BAO/Address.php

CRM/Core/BAO/Email.php

CRM/Core/BAO/IM.php

CRM/Core/BAO/OpenID.php

CRM/Core/BAO/Phone.php

CRM/Core/BAO/Website.php

CRM/Core/Resources.php

CRM/Mailing/Form/Test.php

CRM/Upgrade/Incremental/php/FourOne.php

CRM/Upgrade/Incremental/php/FourThree.php

CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl

CRM/Upgrade/Incremental/sql/4.3.beta5.mysql.tpl