Updated .gitmodules
Merge branch 'master' of github.com:jgm/emacsd

Conflicts:
	.gitmodules