Change URL to my Emacs blog feed
Change URL to my Emacs blog feed
Merge branch 'patch-2'

Conflicts:
	en.ini