Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-31-12-20-39
authorKurund Jalmi <kurund@yahoo.com>
Mon, 31 Aug 2015 19:23:15 +0000 (12:23 -0700)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 31 Aug 2015 19:23:15 +0000 (12:23 -0700)
commit6dd5c484fe8bad23de027e9de47277671ac57632
treee29fe4bb229e0a5b3dc15700e2922488442ea8fa
parent7a7971bd6efc4c713933abb705d165bb677344b3
parent007506b2f12ba3af5577a66e0737f850c3fd4a2d
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-31-12-20-39

Conflicts:
CRM/Activity/BAO/Query.php
CRM/Campaign/BAO/Query.php
CRM/Contribute/BAO/Query.php
CRM/Event/BAO/Query.php
CRM/Member/BAO/Query.php
CRM/Pledge/BAO/Query.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
xml/version.xml
14 files changed:
CRM/ACL/API.php
CRM/Contact/Form/Task/EmailCommon.php
CRM/Contribute/Form/AbstractEditPayment.php
CRM/Contribute/Form/ContributionPage/Widget.php
CRM/Core/BAO/ActionSchedule.php
CRM/Event/BAO/Participant.php
CRM/Event/Form/Registration.php
CRM/Pledge/Form/Pledge.php
CRM/Report/Form.php
CRM/Report/Form/Contribute/Summary.php
CRM/Utils/System/Base.php
templates/CRM/Admin/Page/APIExplorer.js
templates/CRM/Event/Page/DashBoard.tpl
tests/phpunit/api/v3/ACLPermissionTest.php