CiviCRM from upstream: 4.1.1-drupal6
CiviCRM from upstream: 4.2.6-drupal6
CiviCRM from upstream: 4.2.8-drupal6
wmf patches to civi 4.1.1
Merge contrib 4.2.8-drupal6

Conflicts:
	CRM/ACL/BAO/ACL.php
	CRM/ACL/BAO/Cache.php
	CRM/Contact/BAO/Contact.php
	CRM/Contact/BAO/GroupContactCache.php
	CRM/Contact/Form/CustomData.php
	CRM/Contact/Form/Search.php
	CRM/Contact/Form/Search/Custom/FullText.php
	CRM/Contact/Page/DedupeFind.php
	CRM/Contribute/BAO/ContributionRecur.php
	CRM/Contribute/Form/Contribution.php
	CRM/Contribute/Form/Search.php
	CRM/Contribute/xml/Menu/Contribute.xml
	CRM/Core/BAO/CustomField.php
	CRM/Core/BAO/CustomGroup.php
	CRM/Core/BAO/Mapping.php
	CRM/Core/Config.php
	CRM/Core/Menu.php
	CRM/Core/OptionGroup.php
	CRM/Core/Smarty.php
	CRM/Export/BAO/Export.php
	CRM/Export/Form/Map.php
	CRM/Report/Form.php
	CRM/Utils/Hook.php
	api/class.api.php
	api/v3/utils.php
	css/civicrm.css
Merge remote-tracking branch 'origin/master'