Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-14-04-44-13
authorkurund <kurund@civicrm.org>
Tue, 13 Aug 2013 23:21:40 +0000 (04:51 +0530)
committerkurund <kurund@civicrm.org>
Tue, 13 Aug 2013 23:21:40 +0000 (04:51 +0530)
commit67be46e602d4eed73b2739743698bc3f3719df2c
treead60d7456b1258b12d5f01c46cfbca7078924be5
parent3ec1ed784d931417df54a15778de50305c6b1965
parentdce95f9ea74a3df73e0af52473bb0a1fb5bd5787
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-14-04-44-13

Conflicts:
CRM/Contribute/PseudoConstant.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/ContributionBase.php
CRM/Contribute/PseudoConstant.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Utils/System/Joomla.php
xml/schema/Contribute/ContributionRecur.xml