Remove specific code for upgrade from 2.0 to 2.1
CRM-12814, fixed the total issue, code cleanup and notice fixes

----------------------------------------
* CRM-12814: mailings tab slow performance
  http://issues.civicrm.org/jira/browse/CRM-12814
Merge pull request #1285 from kurund/CRM-12814

CRM-12814, fixed the total issue, code cleanup and notice fixes
CRM-12270 fix

----------------------------------------
* CRM-12270: Batch Change Participant Status task sends confirmation email and marks contribution completed when participant status is updated FROM "Pending Pay Later" to "Attended" or "Registered"
  http://issues.civicrm.org/jira/browse/CRM-12270
CRM-12186 fix

----------------------------------------
* CRM-12186: Fonts in new profile editor preview mode are too small and wrapped.
  http://issues.civicrm.org/jira/browse/CRM-12186
Merge pull request #1288 from monishdeb/CRM-12186

CRM-12186 fix
Merge pull request #1286 from monishdeb/CRM-12270

CRM-12270 fix
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16

Conflicts:
	CRM/Contact/Form/Task/Batch.php
	CRM/Contribute/Form/Task/Batch.php
	CRM/Event/Form/ManageEvent/Fee.php
	CRM/Price/BAO/LineItem.php
	CRM/Utils/System/Base.php
	templates/CRM/Batch/Form/Entry.tpl
CRM-8813 fix

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813
Merge pull request #1289 from monishdeb/CRM-8813

CRM-8813 fix
CRM-8813 Message Template fix

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813
Merge pull request #1291 from monishdeb/CRM-8813

CRM-8813 Message Template fix
CRM-13130, fixed notices and using Avery 5395 as default for layout format

----------------------------------------
* CRM-13130: New Label Format entries do not store the 'name' property in values colum, and produce blank name badges
  http://issues.civicrm.org/jira/browse/CRM-13130
Merge pull request #1217 from samuelsov/CRM-10606

CRM-10606 Remove specific code for upgrade from 2.0 to 2.1
CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions

----------------------------------------
* CRM-13075: Mark is_primary for HRJob records
  http://issues.civicrm.org/jira/browse/CRM-13075
Merge pull request #1295 from totten/master-isprimary-tables

CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions
fix patch for CRM-13090

----------------------------------------
* CRM-13090: New Petition/Survey form validation - enforce unique constraint on ActivityType-Campaign-Title
  http://issues.civicrm.org/jira/browse/CRM-13090
Merge pull request #1296 from dlobo/CRM-13090

fix patch for CRM-13090
Merge pull request #1293 from kurund/CRM-13130

CRM-13130, fixed notices and using Avery 5395 as default for layout form...