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

Conflicts:
	en.ini
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of git://github.com/Bruce-Connor/planet.emacsen.org into Bruce-Connor-master

Conflicts:
	en.ini