org mode launches word for .doc links
Merge branch 'master' of github.com:derekmacdonald/emacs

Conflicts:
	ac-comphist.dat