Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-03-11-26-36
authorKurund Jalmi <kurund@yahoo.com>
Mon, 3 Aug 2015 07:07:08 +0000 (12:37 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 3 Aug 2015 07:07:08 +0000 (12:37 +0530)
commitdbb12634432abb2e58e0f4e4e0f318fa116960f3
treec04555cc94bfc2309c543a945c9415de54208518
parentf5e5d86733510ba9200cd3c7b9f67fbabca64e64
parenta1c763909aa05735a335b620022f1a9423a0946c
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-03-11-26-36

Conflicts:
CRM/Core/BAO/CustomQuery.php
CRM/Core/Resources.php
sql/civicrm_generated.mysql
12 files changed:
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/GroupContactCache.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Search/Advanced.php
CRM/Contribute/Form/Search.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/Resources.php
CRM/Utils/Hook.php
js/Common.js
templates/CRM/Admin/Page/APIExplorer.js
xml/templates/civicrm_navigation.tpl