Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54
authorkurund <kurund@civicrm.org>
Tue, 18 Feb 2014 02:32:16 +0000 (08:02 +0530)
committerkurund <kurund@civicrm.org>
Tue, 18 Feb 2014 02:32:16 +0000 (08:02 +0530)
commit1e6ea7e36b5815a6711674a148c44b6d75bdcf47
tree3947772439aed6a989ed2cb0a14b4ec69d5331cb
parentfc7d273b8f2fee1572d43a8e64984298df86c80e
parent1d5ba158381a626f04efea0ebafa21e5809b6a71
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54

Conflicts:
CRM/Utils/Hook/Joomla.php
api/v3/examples/LocBlock/Create.php
api/v3/examples/LocBlock/CreateEntities.php
api/v3/examples/LocBlock/Get.php
api/v3/examples/LocBlock/createEntities.php
api/v3/examples/LocBlock/getEntities.php
api/v3/examples/LocBlock/simpleCreate.php
api/v3/examples/LocBlockCreate.php
api/v3/examples/LocBlockCreateEntities.php
api/v3/examples/LocBlockGet.php
12 files changed:
CRM/Activity/BAO/Activity.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Export/BAO/Export.php
CRM/Friend/BAO/Friend.php
CRM/Friend/Form/Contribute.php
CRM/Friend/Form/Event.php
CRM/Utils/Hook/Joomla.php
api/v3/Activity.php
api/v3/examples/LocBlock/createEntities.php
api/v3/utils.php
css/civicrm.css
tests/phpunit/CiviTest/CiviUnitTestCase.php