]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68e3050 868490b)
merge upstream
authorJoakim Verona <joakim@verona.se>
Wed, 12 Jun 2013 21:08:43 +0000 (23:08 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 12 Jun 2013 21:08:43 +0000 (23:08 +0200)

Trivial merge