Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08
authorTim Otten <totten@civicrm.org>
Tue, 16 Apr 2013 17:40:13 +0000 (10:40 -0700)
committerTim Otten <totten@civicrm.org>
Tue, 16 Apr 2013 17:40:13 +0000 (10:40 -0700)
commitf08f9420efd6ad7d8daf4c450c069592fa6abde4
treea0048b1908e04e44cbfe2c6f1aa47371ab32effe
parent1b68288c9d4198d93e50894e251874c728596247
parentc16028a675c1d1ed60d176cda555b371520c5c1f
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
CRM/Contribute/Form/Contribution.php
CRM/Utils/REST.php
api/v3/examples/SettingGetfields.php
templates/CRM/Activity/Form/Activity.tpl