Gaetan Semet 62e40902ff Merge remote-tracking branch 'upstream/master' ... Conflicts: .gitignore plugins/git/git.plugin.zsh		2013-10-25 16:03:23 +02:00
..
example	Adding ability to override plugins from the custom directory.	2011-05-26 12:34:37 -05:00
plugins	Merge remote-tracking branch 'upstream/master'	2013-10-25 16:03:23 +02:00
example.zsh	Moving some example files into custom/	2009-09-23 08:02:58 -07:00