3 commits

Author	SHA1	Message	Date
Hunter Haugen	4d2585bc49	I forget this one	2010-06-23 16:26:37 -07:00
Hunter Haugen	eea1c65b9c	no longer conflicting	2010-04-08 15:40:17 -07:00
Hunter Haugen	500650660d	Updating emacs stuff	2010-03-08 10:33:36 -08:00