]> git.eshelyaron.com Git - emacs.git/commitdiff
conflict resolve
authorJoakim Verona <joakim@verona.se>
Tue, 26 Mar 2013 15:20:17 +0000 (16:20 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 26 Mar 2013 15:20:17 +0000 (16:20 +0100)

Trivial merge