Gaetan Semet a96971e7a8 Merge remote-tracking branch 'upstream/master' ... Conflicts: templates/zshrc.zsh-template		2014-12-01 11:30:35 +01:00
..
zshrc-linux.zsh	stibb: enable colored-man	2014-11-24 13:44:17 +01:00
zshrc-mac.zsh	sync plugins with mac	2014-11-24 13:44:58 +01:00
zshrc.zsh-template	Merge remote-tracking branch 'upstream/master'	2014-12-01 11:30:35 +01:00