Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Sat, 26 Sep 2015 16:16:57 +0000 (12:16 -0400)
committerColeman Watts <coleman@civicrm.org>
Sat, 26 Sep 2015 16:16:57 +0000 (12:16 -0400)
commiteb13603069edaafc80571879417d376f81f84c5a
treeec97ad61ff86dc98c498e914724216aa1cbf3c44
parentb58491e094ea12185dddc133d995d452a4ab8dc3
parente5773e67f7e3e4be00397322aca885ae6348419f
Merge branch '4.6' into master

Conflicts:
CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl
CRM/ACL/API.php
CRM/Contact/BAO/Group.php
CRM/Contact/Form/DedupeRules.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/UFGroup.php
CRM/Core/PseudoConstant.php
CRM/Price/BAO/PriceField.php
CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl
templates/CRM/Case/Form/CaseView.js