]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 17:47:29 +0000 (19:47 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 17:47:29 +0000 (19:47 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge