Natal Ngétal 6f7d2eb772 Merge remote branch 'upstream/master' ... Conflicts: lib/functions.zsh plugins/git/git.plugin.zsh plugins/perl/perl.plugin.zsh		2011-04-15 15:10:55 +02:00
..
git.plugin.zsh	Merge remote branch 'upstream/master'	2011-04-15 15:10:55 +02:00