Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-28-17-02-35
authorkurund <kurund@civicrm.org>
Tue, 28 Oct 2014 21:03:43 +0000 (17:03 -0400)
committerkurund <kurund@civicrm.org>
Tue, 28 Oct 2014 21:03:43 +0000 (17:03 -0400)
commitdcaaae9c6fcc467f36c086cd77507b1895c060a5
tree09cd6bf37398d4d1a384a9f2b18f257e11b03901
parentc18806e78ad73686f230412608fbe909d73bc489
parentaa0e236add2f16db1dabb6d8b3d1f8e6e1098578
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-28-17-02-35

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/BAO/ActionSchedule.php
CRM/Event/Cart/Page/CheckoutAJAX.php
css/civicrm.css
templates/CRM/Event/Form/Registration/Register.tpl
tests/phpunit/CiviTest/CiviUnitTestCase.php