Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-25-10-57-01
authorkurund <kurund@civicrm.org>
Mon, 25 Aug 2014 05:30:50 +0000 (11:00 +0530)
committerkurund <kurund@civicrm.org>
Mon, 25 Aug 2014 05:30:50 +0000 (11:00 +0530)
commit9cc8b9b246a371b9621a8279545258073fbd0e48
tree3a2cee357a06396e58795bea9839ae6e64416be8
parentaf536b54d94479ae252842841ce29ebd1d963554
parent0c26efc771db488578f3c6b0c5021d4bfaac19a7
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-25-10-57-01

Conflicts:
tests/phpunit/CiviTest/CiviUnitTestCase.php
CRM/Activity/Import/Parser/Activity.php
CRM/Report/Form/Member/Detail.php
CRM/Utils/VersionCheck.php
api/v3/utils.php
templates/CRM/Contact/Form/Merge.tpl
templates/CRM/common/dedupe.tpl
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ACLPermissionTest.php