update Tue Oct  1 10:11:42 PDT 2013
update Tue Oct  1 10:12:06 PDT 2013
Merge branch 'master' of https://github.com/teliib/dotfiles

Conflicts:
	.pentadactylrc