Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52
authorkurund <kurund@civicrm.org>
Tue, 14 Oct 2014 05:59:50 +0000 (11:29 +0530)
committerkurund <kurund@civicrm.org>
Tue, 14 Oct 2014 05:59:50 +0000 (11:29 +0530)
commit8892984acd5354dc8d672afed9e67993c2e3cb82
treeb4c15cd3744c346a0a63e157a5cd278eb9d9c3b9
parent321f0e202eb5bbd30338176b70147a4494bc3621
parent42bf93368ea81b2fa70fab038f3c884755e1ab88
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52

Conflicts:
CRM/Core/xml/Menu/Misc.xml
CRM/Upgrade/Page/Upgrade.php
sql/civicrm_generated.mysql
xml/version.xml
13 files changed:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/xml/Menu/Misc.xml
CRM/Event/Form/Participant.php
CRM/Member/BAO/Membership.php
CRM/Member/Form/Membership.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
CRM/Upgrade/Page/Upgrade.php
templates/CRM/Contribute/Form/Contribution/Main.tpl
templates/CRM/Member/Form/Membership.tpl
tests/phpunit/CiviTest/CiviUnitTestCase.php