Merge from upstream, fixed zsh.nanorc

This commit is contained in:
Marin Marusic 2016-02-09 01:37:23 +01:00
commit d12d655624

Diff content is not available