Fix merge head on master.
authoreileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 05:58:08 +0000 (18:58 +1300)
committereileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 05:59:59 +0000 (18:59 +1300)
commit7d6e7658c1df18d74f9c686a78ddf8e6ed09df63
tree0e82ccb4cd25594b806580db8414ff821b24bbf6
parentc5afd92b029f444a1b5e7f38cb5a44990363058c
parent58025217985f3c8cfc51b82f0b3b1195030cc0d3
Fix merge head on master.

Master is treating some 4.7.18-rc commits as unmerged. This just marks as merged : Merge commit '58025217985f3c8cf'