Merge branch 'master' of github.com:garaemon/emacs.d
fix inline indentation for C++