Merge branch '5.6' of https://github.com/civicrm/civicrm-core
authoreileen <emcnaughton@wikimedia.org>
Thu, 20 Sep 2018 22:48:29 +0000 (10:48 +1200)
committereileen <emcnaughton@wikimedia.org>
Thu, 20 Sep 2018 22:48:29 +0000 (10:48 +1200)
commitfbcd961e5f6022d814c00a68afafb2236a190f1c
tree206feb823c50f8275662c223154a6982153108d6
parent912696da6f8a447edd9fe3a65ada03109d84107f
parent0434d0f2fd2270c067d2e6b7e8cf6cf86530a8b3
Merge branch '5.6' of https://github.com/civicrm/civicrm-core

Change-Id: I2dd0a9d8f83fe13b7f731db0b959a67e3dd0ae9f