Gaetan Semet e027530ca5 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # .gitignore		2016-05-26 15:28:55 +02:00
..
plugins	rework rs* alias in repo	2016-05-26 15:25:55 +02:00
example.zsh	Reword and clarify example.zsh custom file	2016-05-12 13:59:10 +02:00