Gaetan Semet 881a2be64f Merge remote-tracking branch 'upstream/master' ... # Conflicts: # plugins/jump/jump.plugin.zsh		2016-10-11 21:56:56 +02:00
..
jump.plugin.zsh	Merge remote-tracking branch 'upstream/master'	2016-10-11 21:56:56 +02:00