Empty merge commit to mark 4.7.18-rc merged.
authoreileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 06:54:25 +0000 (19:54 +1300)
committereileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 06:54:25 +0000 (19:54 +1300)
commit34701226786f67c455cbbea360d40c8d74c25cba
tree70307bd70c00f09b0f6234b4eb1b44fe42b34ba9
parent9b5914f25f2b82a45334c2e6019b385810071607
parentd46d3eaa0bd4c21d4a4347ee5b1147159885eaea
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