Gaetan Semet 9a63084e20 Merge remote-tracking branch 'upstream/master' ... Conflicts: plugins/git/git.plugin.zsh plugins/jump/jump.plugin.zsh		2015-08-10 16:15:53 +02:00
..
jump.plugin.zsh	Merge remote-tracking branch 'upstream/master'	2015-08-10 16:15:53 +02:00