CRM-15140 Incomptibility with Drupal Metatag module - wrong page titles
Merge pull request #156 from eileenmcnaughton/7.x-4.4

CRM-15140 Incomptibility with Drupal Metatag module - wrong page titles
CRM-15173 Add Drush action to do civicrm_member_role_sync
CRM-15174
Merge pull request #157 from eileenmcnaughton/CRM-15173

CRM-15173 Add Drush action to do civicrm_member_role_sync
Merge pull request #158 from eileenmcnaughton/CRM-15174

CRM-15174 wording clarification on membership roles
CRM-11161 - Drupal 7 - don't add contacts statically to smart groups; remove as well as add sync'd roles on login.

----------------------------------------
* CRM-11161: Civicrm Group Roles Sync: support proper syncing of smart groups as well as static groups
  https://issues.civicrm.org/jira/browse/CRM-11161
Merge pull request #170 from davejenx/CRM-11161-D7

CRM-11161 - Drupal 7 - don't add contacts statically to smart groups; re...
CRM-15425: patched views field handlers for file URL output
Merge pull request #186 from eileenmcnaughton/7.x-4.4

CRM-15425: patched views field handlers for file URL output
CRM-15337 - Fix undefined index in civicrm_metatag_page_cache_cid_parts_alter

Conflicts:
	civicrm.module
Merge pull request #195 from eileenmcnaughton/CRM-15337

CRM-15337 - Fix undefined index in civicrm_metatag_page_cache_cid_parts_...
CRM-14251 views integration:event links - return empty instead of non-link
text where link is not permissioned
CRM-14437 CiviEngage walklist fixes
Fix for CRM-14389. Support Float data in CiviCRM Views
CRM-14821
As discussed in CRM-14267, applied patch and tested.
CRM-15074 - _civicrm_registerClassLoader() should store a relative path.
CRM-14936. Check for existence of Block module.
CRM-15337 - Fix undefined index in civicrm_metatag_page_cache_cid_parts_alter

Conflicts:
	civicrm.module