Look at the commit in between those two. It looks like someone reverted the first merge and then re-did it.

On Thu, Nov 13, 2014 at 7:39 AM, Dani Moncayo <dmoncayo@gmail.com> wrote:
And I don't see more cases like these.  But note that there are two
different commits with the same message:

  Merge from emacs-24; up to 117669