Merge remote-tracking branch 'civi/4.7.12-rc'
authorColeman Watts <coleman@civicrm.org>
Thu, 22 Sep 2016 18:42:28 +0000 (14:42 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 22 Sep 2016 18:42:28 +0000 (14:42 -0400)
commitcdd1a129f4ec22bdb84346446e983886ec761300
treebc01449950ce69b23478864bfadc1ab9996f5606
parent1cd209c450dd5bb582b04cb7553f00408d9f5750
parent35f21e7d4aa48814d79dd9738c356cf11e35b70a
Merge remote-tracking branch 'civi/4.7.12-rc'