java change
Merge branch 'master' of github.com:fireinice/fii-dot-emacs