Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58
authorKurund Jalmi <kurund@yahoo.com>
Thu, 6 Aug 2015 15:10:24 +0000 (20:40 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Thu, 6 Aug 2015 15:10:24 +0000 (20:40 +0530)
commit0f1428e71dd43dc0b146d18a64aa51cd7ac832da
tree4c6ba69bb41ca1d82fcfb218c76f323968d4335e
parentc92e1f42d8b5c6589b8e11796b200aa73e748284
parentfc47f7a5f65e6704c6901965f984cc4a06b727e8
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58

Conflicts:
CRM/Upgrade/Incremental/php/FourSix.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Core/Controller.php
CRM/Core/Form.php
CRM/Report/Form/Mailing/Summary.php
CRM/Upgrade/Incremental/php/FourSix.php
Civi/API/Subscriber/ChainSubscriber.php
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/EventTest.php