Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Mon, 20 Jul 2015 14:20:33 +0000 (10:20 -0400)
committerColeman Watts <coleman@civicrm.org>
Mon, 20 Jul 2015 14:20:33 +0000 (10:20 -0400)
commit3918a4767354f491f34d92b0667798d944fa0ed8
treecf2f62de5acc76004d861c540d6a386862e62629
parent553d3a8ee8bf2416051288a5192667807aad4df5
parente12eb3025f8530b6851b525f770e51eb1b619b99
Merge branch '4.6' into master
CRM/Contact/Form/Search/Advanced.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomQuery.php
templates/CRM/Case/Form/Activity.tpl