bug#18334: 24.3.93; ImageMagick: eww shows favicon animations in search results

[Stefan Monnier]

> Could you do a merge with trunk?  >"?

Not sure what you mean by that.  But I just sync'd the trunk with the
emacs-24 branch.  In case you wonder how to do that.
Well, you can do "bzr merge .../emacs-24" of course, but in order to
handle a few details and avoid some spurious conflicts, you can instead
use
- M-x load RET .../trunk/admin/bzrmerge.el RET
- M-x cd RET .../trunk RET
- Mx- bzrmerge RET .../emacs-24 RET
which will guess at some commits that don't need to be merged (e.g. because
its commit message says that it's a backport) and ask you for
confirmation that these should indeed be skipped.


        Stefan