Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-24-15-59-25
authorkurund <kurund@civicrm.org>
Mon, 24 Nov 2014 10:31:09 +0000 (16:01 +0530)
committerkurund <kurund@civicrm.org>
Mon, 24 Nov 2014 10:31:09 +0000 (16:01 +0530)
commit6327b760fa13ddc865aafb0486c090073dede3d8
tree1013488b3dd085135a984198fe55e26395b93ff5
parentdf0328a574659f0d49905fae02edc261a44cc304
parent8716a381bafeb8b80148c1f36de71aec5e1f3faf
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-24-15-59-25

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
CRM/Contribute/BAO/Contribution.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Event/Form/Participant.php
api/v3/Contribution.php
js/model/crm.uf.js
templates/CRM/Campaign/Form/Search/Campaign.tpl
templates/CRM/Campaign/Form/Search/Petition.tpl
templates/CRM/Campaign/Form/Search/Survey.tpl