Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.
[bpt/emacs.git] / etc / .gitignore
1 DOC
2 icons/