Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-13-12-30-17
authorKurund Jalmi <kurund@yahoo.com>
Mon, 13 Jul 2015 07:04:10 +0000 (12:34 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 13 Jul 2015 07:04:10 +0000 (12:34 +0530)
commit88d3877e2dbcdfdf52d9eaa6c3938ae46be54dd8
treecd6f9d2a035b3b912b9367aba4022107d1ea968a
parent275b9117c6f199ad15dabccb12f67af09b93981a
parent3d35a90ad5810fb656022b865acaccc8748d4cc7
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-13-12-30-17

Conflicts:
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Query.php
CRM/Core/BAO/UFGroup.php
CRM/Utils/System/Joomla.php
tests/phpunit/CiviTest/CiviUnitTestCase.php