CRM-12759 employer not being added to Multisite group
preliminary whitespace
CRM-12759 fix inconsistency in application of multisite setting
CRM-12766

----------------------------------------
* CRM-12766: Upgrade html2text to version shipped by roundcube
  http://issues.civicrm.org/jira/browse/CRM-12766
CRM-12466 - Fix missing var (follow up to #927)

----------------------------------------
* CRM-12466: Group listings don't load
  http://issues.civicrm.org/jira/browse/CRM-12466
Merge pull request #963 from dlobo/CRM-12766

CRM-12766 - Unit test for html2text
Merge pull request #964 from totten/4.3-smartgroupcache-missingvar

CRM-12466 - Fix missing var
Merge pull request #948 from eileenmcnaughton/4.3

CRM-12759 - Multisite add to group code doesn't kick in when a group is being added