]> code.delx.au - gnu-emacs/commitdiff
Merge branch 'map'
authorNicolas Petton <nicolas@petton.fr>
Thu, 4 Jun 2015 20:30:29 +0000 (22:30 +0200)
committerNicolas Petton <nicolas@petton.fr>
Thu, 4 Jun 2015 20:30:29 +0000 (22:30 +0200)
1  2 
etc/NEWS

diff --cc etc/NEWS
Simple merge