merge trunk
[bpt/emacs.git] / lisp / obsolete / .gitignore
1