merging emacs-24 (was: bug#19074: Bug in auth-source.el's search of OS X Keychain)

[Stefan Monnier]

> Is it enough to merge laconically like you did:
[...]
> ...and resolve conflicts as needed?

Yes.  Be careful with the conflicts, tho: some of those patches should
simply not be applied (regardless if they'd create conflicts or not).

You might prefer to wait for the gitmerge.el  to appear (I thought it
was supposed to be done already, but I guess it's taking a bit more
time than expected).


        Stefan