Merge branch 'master' of ssh://wking@einstein/~/public_html/code/git/dotfiles
authorW. Trevor King <wking@drexel.edu>
Wed, 26 Nov 2008 17:45:14 +0000 (12:45 -0500)
committerW. Trevor King <wking@drexel.edu>
Wed, 26 Nov 2008 17:45:14 +0000 (12:45 -0500)
1  2 
Makefile

diff --cc Makefile
Simple merge