]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Sat, 14 Sep 2013 09:40:24 +0000 (11:40 +0200)
committerJoakim Verona <joakim@verona.se>
Sat, 14 Sep 2013 09:40:24 +0000 (11:40 +0200)
1  2 
src/buffer.c

diff --cc src/buffer.c
Simple merge