Merge branch 'patch-1' of https://github.com/CyberShadow/oh-my-fish into CyberShadow-patch-1

This commit is contained in:
Jorge 2015-03-11 08:35:46 +09:00
commit 06c8df444e