CRM-14513 - Added hourly admin message when outbound email is disabled.
CRM-14367 make pdf option dependent on site setting
CRM-14570 - Participant Role Notices in postprocess.
Web Test Fix
Merge pull request #3135 from eileenmcnaughton/CRM-14367-pdf-option

CRM-14367 make pdf option dependent on site setting
CRM-14367 - Prevent notice by adding display_name to $returnProperties. Also remove unintentionally committed debug line in CRM/Mailing/Form/Settings.php

----------------------------------------
* CRM-14367:
  https://issues.civicrm.org/jira/browse/CRM-14367
Merge pull request #3184 from davecivicrm/CRM-14367a

CRM-14367 - Prevent notice by adding display_name to $returnProperties. ...
Merge pull request #3122 from TobiasLounsbury/14513

CRM-14513 - Added every two hour admin message when outbound email is disabled.
Update Page.php

Change outbound email alert and debug alert timer to 2 hours. dgg
CRM-14513 - fixed the constant being checked - should be CIVICRM_MAIL_LOG.

----------------------------------------
* CRM-14513:
  https://issues.civicrm.org/jira/browse/CRM-14513
Merge pull request #3185 from davecivicrm/CRM-14513

CRM-14513 - fixed the constant being checked - should be CIVICRM_MAIL_LO...
Merge pull request #3181 from atif-shaikh/WebTextFix

WebTestFix
Merge pull request #3182 from jitendrapurohit/Webtest_fix_4.5alpha

Web Test Fix
Merge pull request #3156 from KarinG/CRM-14570

CRM-14570 - Participant Role Notices in postprocess.
CRM-13981, Handling Soft Credit for Gift Membership

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  https://issues.civicrm.org/jira/browse/CRM-13981
Merge pull request #3187 from monishdeb/CRM-13981

CRM-13981, Handling Soft Credit for Gift Membership
CRM-13776 limit the reminder to 'administer CiviCRM' permission
Merge pull request #3189 from yashodha/CRM-13776

CRM-13776 limit the reminder to 'administer CiviCRM' permission
WebTestFix