ros/catkin — pull request #688 by de-vri-es (2014-10-20 21:51:33+00:00)
Title: use emulate -L in setup.zsh to keep options intact

Should resolve issue #686. The original overwrites options explicitly set by the user in their zshrc.