Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-14-11-21-50
authorkurund <kurund@civicrm.org>
Fri, 14 Nov 2014 05:54:48 +0000 (11:24 +0530)
committerkurund <kurund@civicrm.org>
Fri, 14 Nov 2014 05:54:48 +0000 (11:24 +0530)
commit3c230724ef43e5e842d00014d729d40c3eb5bd96
tree3d81d007d13f07d2e7c9eaf204d4b9c910ce3cc0
parent0142449a2155f632335f480a45510946d6ffcb37
parent628f420deb7851cc86650feaf8acf68932e2741b
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-14-11-21-50

Conflicts:
CRM/Event/BAO/Query.php
sql/civicrm_generated.mysql
xml/version.xml
12 files changed:
CRM/Admin/Form/ScheduleReminders.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Event/BAO/Query.php
CRM/Event/Form/ManageEvent/TabHeader.php
CRM/Member/BAO/Membership.php
CRM/Member/Form/Membership.php
CRM/Price/Page/Field.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
css/civicrm.css
templates/CRM/Contact/Form/Search/Builder.js
templates/CRM/Event/Form/ManageEvent/Registration.tpl
xml/templates/civicrm_data.tpl