Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-08-20-42-29
authorkurund <kurund@civicrm.org>
Mon, 8 Sep 2014 15:20:44 +0000 (20:50 +0530)
committerkurund <kurund@civicrm.org>
Mon, 8 Sep 2014 15:20:44 +0000 (20:50 +0530)
commit88c6259e813c523210e799e874ece50131ebe6d7
tree38a71ff1a092b9304e60850595d1c3767afd1e24
parent1de7c5b0182dc54fdfc39c642078a31962dd4257
parentf66a0a20153c244d19a50d0ae2159b4f45890ee9
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-08-20-42-29

Conflicts:
CRM/Contribute/Form/Contribution/Main.php
templates/CRM/Price/Page/Field.tpl
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/Menu.php
CRM/Price/BAO/PriceSet.php
CRM/Price/Page/Field.php
templates/CRM/Price/Page/Field.tpl
tests/phpunit/CRM/Member/BAO/MembershipTest.php