]> code.delx.au - gnu-emacs/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 15:57:09 +0000 (17:57 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 15:57:09 +0000 (17:57 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge