----------------------------------------
* CRM-12096:
  http://issues.civicrm.org/jira/browse/CRM-12096

CRM-12341 - use wildcards only as suffix

CRM-12347

CRM-8963

----------------------------------------
* CRM-12347: Rebuild Smart Group Cache errors out if limit=50 configured in parameters
  http://issues.civicrm.org/jira/browse/CRM-12347

----------------------------------------
* CRM-8963: Batch update profile: states do not change with country
  http://issues.civicrm.org/jira/browse/CRM-8963

----------------------------------------
* CRM-12347: Rebuild Smart Group Cache errors out if limit=50 configured in parameters
  http://issues.civicrm.org/jira/browse/CRM-12347

----------------------------------------
* CRM-8963: Batch update profile: states do not change with country
  http://issues.civicrm.org/jira/browse/CRM-8963

----------------------------------------
* CRM-12341: prev/next cache should not do double-ended wildcard search
  http://issues.civicrm.org/jira/browse/CRM-12341

-- CRM-12284 Tested all the bug cases listed in CRM-12284. There is a new notice which I will post to the issue and assign back to Pradeep to fix.

Fix version comparisons CRM-12335

Remove leftover jQuery from profile snippets CRM-12329

CRM-12333 and lots of formatting fixes

----------------------------------------
* CRM-12333: Unescaped items in upgrade SQL script
  http://issues.civicrm.org/jira/browse/CRM-12333

CRM-12334 formatting and always assign a value

----------------------------------------
* CRM-12334: $config->activityAssigneeNotification referenced in tpl but never set
  http://issues.civicrm.org/jira/browse/CRM-12334

copy of batch-countrystatecounty for 4.3

CRM-12334 set assignee notification in smarty

CRM-12332 and fix spelling

CRM-12322 remove multisite specific ACL portion 

----------------------------------------
* CRM-12332: Strict warning when adding a new member
  http://issues.civicrm.org/jira/browse/CRM-12332

 CRM-12330 - Caching bugs in api setting code

-- CRM-12328 testcase

interim commit setting test passing but regression on api test

fix setting test to only call create if required

add a bit more assertation description on test

version fixes

Add tools/scripts/merge-forward