]> code.delx.au - gnu-emacs/commitdiff
Merge from trunk.
authorBill Wohler <wohler@newt.com>
Sun, 25 Nov 2012 18:33:16 +0000 (10:33 -0800)
committerBill Wohler <wohler@newt.com>
Sun, 25 Nov 2012 18:33:16 +0000 (10:33 -0800)
1  2 
etc/NEWS

diff --cc etc/NEWS
Simple merge