Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-28-20-20-34
authorkurund <kurund@civicrm.org>
Wed, 28 Aug 2013 14:56:49 +0000 (20:26 +0530)
committerkurund <kurund@civicrm.org>
Wed, 28 Aug 2013 14:56:49 +0000 (20:26 +0530)
commit66c6206c9d19f2aa13ff0f7051c9952b6fbdad50
treecab653fbf69a102b93233dc569bca02265a48850
parent9a516509e9888dba9065ab5f258ba0b99c0f1633
parent4425db19da543e9a0894895b009797a076291ddb
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-28-20-20-34

Conflicts:
sql/civicrm_generated.mysql
tests/phpunit/WebTest/Contact/RelationshipAddTest.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Page/View/Relationship.php
CRM/Contact/Selector.php
CRM/Core/PseudoConstant.php
sql/GenerateData.php
templates/CRM/Contact/Form/Relationship.tpl
tests/phpunit/WebTest/Contact/RelationshipAddTest.php