Posts for year 2011 2011-10-24 21:00Emacs and Subversion merge conflicts 2011-06-29 19:43A revamped blog