]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62dd123 48c226c)
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