Merge pull request #61 from eileenmcnaughton/6.x-master

D6 backports of d7 patches for fatal errors where functions have been removed
Remove extraneous require_once calls
CRM-13737 fix d6 code to facilite altered directory structure
CRM-13737 add finder fn for alternate folder structures

Conflicts:
	civicrm.module
D6 Integration - reinstate smary require_once

as it is not a class
Merge pull request #89 from eileenmcnaughton/6.x-4.4

CRM-13737 fix d6 code to facilite altered directory structure
Set views field handlers for gender and phone type to use new pseudoconstant access.
Merge pull request #94 from torrance/6.x-master

Set views field handlers for gender and phone type to use new pseudoconstant access.
CRM-13737 d6 drupal integration - add default to variable_get call
fix more pseudoconstants - gender & phone type
removed pseudoconstant DAO calls with BAO across drupal 6 integration module
Merge pull request #92 from eileenmcnaughton/6.x-4.4

CRM-13737 d6 drupal integration - add default to variable_get call
CRM-13826 - Views D6 - Fix tag pseudoConstant
Merge pull request #100 from colemanw/6.x-4.4

CRM-13826 - Views D6 - Fix tag pseudoConstant
Merge remote-tracking branch 'upstream/6.x-4.4' into 6.x-4.4-6.x-master-2013-12-04-15-12-16

Conflicts:
	modules/views/civicrm/civicrm_handler_field_gender.inc
	modules/views/civicrm/civicrm_handler_field_phone_type.inc
Update version numbers to 4.4
Merge pull request #105 from ar-jan/6.x-version-4.4

Update version numbers to 4.4
Merge remote-tracking branch 'upstream/6.x-4.4' into 6.x-4.4-6.x-master-2013-12-16-21-41-16
remove old require once
backported comments from d7 views