From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 29 Mar 2017 06:54:25 +0000 (+1300)
Subject: Empty merge commit to mark 4.7.18-rc merged.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=34701226786f67c455cbbea360d40c8d74c25cba;p=civicrm-core.git

Empty merge commit to mark 4.7.18-rc merged.

Somehow we lost the merged marker with a cherry pick.

Have used merge -s ours d46d3ea to grab these as empty-but-merged
---

34701226786f67c455cbbea360d40c8d74c25cba