Merge branch '4.7.14-rc' into master
authorColeman Watts <coleman@civicrm.org>
Thu, 24 Nov 2016 01:20:26 +0000 (20:20 -0500)
committerColeman Watts <coleman@civicrm.org>
Thu, 24 Nov 2016 01:20:26 +0000 (20:20 -0500)
commit05b465b16621f4ea18efcb049794ce26c397b13e
treef93043d1ac15d49e908077ab8e494cb5100167ab
parentcec1762da5a9abe365b24ed25a8b8271168cfc20
parentdf03ce4d5c51e99f6e1a54a524001cd772b45eb9
Merge branch '4.7.14-rc' into master

Conflicts:
CRM/Utils/System/DrupalBase.php