Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-16-18-06-10
authorKurund Jalmi <kurund@yahoo.com>
Sun, 16 Aug 2015 12:42:03 +0000 (18:12 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Sun, 16 Aug 2015 12:42:03 +0000 (18:12 +0530)
commit3a1ac5e5b567f155a28311060e126a12db72db12
tree8434e88739e0635a2c696a52c6eb15f4e2072e74
parenta901cd4b8711efbf75896fd311746e79bc5feeb0
parentc719b983701329c4c508ae07b5b75d6f93add682
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-16-18-06-10

Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Member/Form/MembershipRenewal.tpl
14 files changed:
CRM/Activity/Form/Search.php
CRM/Admin/Form/ScheduleReminders.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Search/Advanced.php
CRM/Core/BAO/ConfigSetting.php
CRM/Core/DAO.php
CRM/Event/Form/Registration.php
CRM/Member/Form/MembershipRenewal.php
CRM/Member/Form/Search.php
CRM/Report/Form/Contribute/Bookkeeping.php
CRM/Upgrade/Incremental/php/FourSix.php
templates/CRM/Admin/Page/ScheduleReminders.tpl
templates/CRM/Member/Form/MembershipRenewal.tpl
xml/templates/civicrm_state_province.tpl