Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-24-02-32-04
authorKurund Jalmi <kurund@civicrm.org>
Fri, 24 May 2013 06:43:24 +0000 (02:43 -0400)
committerKurund Jalmi <kurund@civicrm.org>
Fri, 24 May 2013 06:43:24 +0000 (02:43 -0400)
commitdae00956493ff85036f5f6acc038f0a043eccbec
tree8ebe65ca9c412ca304ffe7078703957973f22766
parent380f917027df5a620254fd30df6aa4ae170a2e11
parent8b83d601045791ccd32589cd00c04ba6a68b2581
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-24-02-32-04

Conflicts:
CRM/Financial/Form/FinancialTypeAccount.php
sql/civicrm_generated.mysql
xml/templates/civicrm_navigation.tpl
16 files changed:
CRM/Activity/BAO/Query.php
CRM/Contact/BAO/Query.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/PseudoConstant.php
CRM/Event/BAO/Query.php
CRM/Financial/Form/FinancialTypeAccount.php
CRM/Member/BAO/Query.php
CRM/Member/Form/Search.php
CRM/Pledge/BAO/Query.php
CRM/Pledge/Form/Search.php
install/template.html
sql/civicrm_generated.mysql
xml/templates/civicrm_navigation.tpl
xml/templates/civicrm_state_province.tpl