Merge pull request civicrm#173 from kurund/CRM-15469

CRM-15469, fixed country filter

Merge pull request civicrm#170 from davejenx/CRM-11161-D7

CRM-11161 - Drupal 7 - don't add contacts statically to smart groups; re...

Merge remote-tracking branch 'upstream/6.x-4.4' into 6.x-4.4-6.x-4.5-…

…2014-09-22-23-28-30

Merge remote-tracking branch 'upstream/6.x-4.4' into 6.x-4.4-6.x-4.5-…

…2014-09-22-23-28-30

Merge pull request civicrm#167 from colemanw/metatag

CRM-15337 - Fix undefined index in civicrm_metatag_page_cache_cid_parts_alter

Merge pull request civicrm#165 from mlutfy/6.x-4.4-crm15331

CRM-15331 [6.x-4.4] Backport for drush civicrm-install: check for the civicrm.settings.template file.

Merge pull request civicrm#162 from davejenx/CRM-15315

CRM-15315 - in civicrm_group_roles_show_rules, fetch all groups, not jus...

Merge pull request civicrm#163 from davejenx/CRM-15315-D6

CRM-15315 - in civicrm_group_roles_show_rules, fetch all groups, not jus...

Merge pull request civicrm#161 from civicrm/7.x-4.4

Merge branch 7.x-4.4 into 7.x-4.5

Merge pull request civicrm#158 from eileenmcnaughton/CRM-15174

CRM-15174 wording clarification on membership roles