Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-10-18-35-58
authorkurund <kurund@civicrm.org>
Sat, 10 Aug 2013 13:13:53 +0000 (18:43 +0530)
committerkurund <kurund@civicrm.org>
Sat, 10 Aug 2013 13:13:53 +0000 (18:43 +0530)
commitf0985b2635377b0e02d204d5adf872fce4997758
tree17b1fbbebe073e7ee79eb5448080a2ea17ffeba8
parent43de70889f954519d6a9bf036397bf8d2d90dd0e
parentb36758b8e7d8be385165ce005e31d240c2a1b487
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-10-18-35-58

Conflicts:
sql/civicrm_generated.mysql
xml/schema/Financial/OfficialReceipt.xml
xml/schema/Financial/files.xml
CRM/Core/BAO/EntityTag.php
CRM/Member/Form/Membership.php
CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php
sql/civicrm_generated.mysql
templates/CRM/Custom/Form/ContactReference.tpl
tests/phpunit/CiviTest/truncate.xml