Merge branch 'master' of github.com:roshambo/dotfiles

Conflicts:
	ubuntu/.bashrc
Christian Rochacommitted parent 29f419aparent eb559ea7580cbbeb309ea8ef1018c75762866447051ae4bBrowse files
11 files changed+545−15

Rendering diff…