CRM-12766

----------------------------------------
* CRM-12766: Upgrade html2text to version shipped by roundcube
  http://issues.civicrm.org/jira/browse/CRM-12766
Merge pull request #8 from eileenmcnaughton/4.2

applied patch for CRM-12705
Merge pull request #9 from eileenmcnaughton/CRM-12766

CRM-12766 (package update also required)
CRM-12750

----------------------------------------
* CRM-12750: upgrade smarty to 2.6.27
  http://issues.civicrm.org/jira/browse/CRM-12750

Conflicts:

	CRM/Admin/Form/Setting/Component.php
Merge pull request #10 from eileenmcnaughton/CRM-12766

 CRM-12750: upgrade smarty to 2.6.27
Backport setup.sh from 4.3 so that we can use the same config for deploying demo sites.
Merge pull request #11 from mlutfy/setupsh-backport

Backport setup.sh from 4.3 so that we can use the same config for deploying demo sites.
Keep 4.2 archive and similar format for CONTRIBUTORS.txt
Merge pull request #12 from mlutfy/contributorsfix

Keep 4.2 archive and similar format for CONTRIBUTORS.txt
CRM-12747 : component access permission defining way for end developer

Conflicts:

	CRM/Contact/Form/Search/Custom.php
Merge pull request #13 from eileenmcnaughton/CRM-12766

 	CRM-12747 : component access permission defining way for end developer
Issue #1: backport fix for version numbers in drupal .info files
Merge pull request #14 from mlutfy/issue1-distmaker

Issue #1: backport fix for version numbers in drupal .info files
Set permissions to 0755 executable.
Set fileformat to unix (not DOS).
Merge pull request #15 from mlutfy/issue1-distmaker

Fix unix file permissions on distmaker.sh, and set unix file format on distmaker.conf.dist
Issue #1: sed for drupal version must be done on DM_TARGETDIR, not DM_SOURCEDIR
Issue #1: sed for drupal version must be done on TRG, not DM_SOURCEDIR
Fix merge conflict.
Merge pull request #17 from mlutfy/issue1-distmaker

Issue #1 again: sed on TRG directory, not DM_SOURCEDIR