Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42
authorkurund <kurund@civicrm.org>
Thu, 2 Jul 2015 05:36:12 +0000 (11:06 +0530)
committerkurund <kurund@civicrm.org>
Thu, 2 Jul 2015 05:36:12 +0000 (11:06 +0530)
commit2748acb994299a226b9053de3638e059e4945128
tree50d79c7fcd09a9886ff3f33dd16039361ce32480
parentc7a01b4c4c1cb9c2198a72df4d93c82118124247
parent8642f698887d73232088e43b710bb3f55ac156c6
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42

Conflicts:
tests/phpunit/api/v3/SyntaxConformanceTest.php
CRM/Contact/BAO/Query.php
CRM/Contribute/Form/Task/Invoice.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ActivityTest.php
tests/phpunit/api/v3/CaseTypeTest.php
tests/phpunit/api/v3/ContributionTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php