Colin Powell 66e76c2764 [conflict] Resolve merge conflict hace 6 meses
..
.aliases 66e76c2764 [conflict] Resolve merge conflict hace 6 meses
.bashrc e7a8071ef5 [ssh] Cleaning up shells and ssh configurablility when not at home hace 9 meses