-- CRM-12284
Add tools/scripts/merge-forward
CRM-12328 switched references to group object for add_to_group_id and add_captcha.

----------------------------------------
* CRM-12328: Profiles: "Add new contacts to group" AND "Include reCaptcha" settings are broken in profile forms
  http://issues.civicrm.org/jira/browse/CRM-12328
Merge pull request #397 from davecivicrm/CRM-12328

CRM-12328 switched references to group object for add_to_group_id and ad...
copy of batch-countrystatecounty for 4.3
Store and reinstate valid state/county when copying
Merge pull request #385 from totten/merge-forward

Add tools/scripts/merge-forward
version fixes
Merge pull request #400 from kurund/version-fixes

version fixes
Add test to check if config setting is correctly retrieved

add a bit more assertation description on test
Add domain id to cachestring
multipledomain config get working

fix setting test to only call create if required
minor fix on setting test where error exposed by fixes elsewhere
fix failing settings test by allowing more cache clearing
interim commit setting test passing but regression on api test
updated version of examples
really finally working
CRM-12322 remove multisite specific ACL portion as aclHook portion further down is better
-- CRM-12328 testcase
Merge pull request #404 from ravishnair/CRM-12328testCase

-- CRM-12328 testcase
Merge pull request #401 from eileenmcnaughton/settingtestnew

 CRM-12330 - Caching bugs in api setting code