an 0bdbc1a4f0 Merge branch 'master' of git@git.greyserv.net:marrub/scripts.git ... Conflicts: computers/lane/vconf vim/vconf		2019-10-19 15:03:26 -04:00
..
lane	Merge branch 'master' of git@git.greyserv.net:marrub/scripts.git	2019-10-19 15:03:26 -04:00
rain	add per-computer configuration files	2019-10-19 13:20:17 -04:00