Merge remote-tracking branch 'robbyrussell/master'

18ef1ee6 · Dawid Ferenczy · eafd5f32 · 192de6bc · 18ef1ee6 · eafd5f32
Commit 18ef1ee6 authored Aug 25, 2015 by Dawid Ferenczy
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
--- a/plugins/history-substring-search/README
+++ b/plugins/history-substring-search/README
--- a/plugins/history-substring-search/README.markdown
+++ b/plugins/history-substring-search/README.markdown
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
--- a/plugins/history/README.md
+++ b/plugins/history/README.md
--- a/plugins/httpie/README.md
+++ b/plugins/httpie/README.md
--- a/plugins/httpie/httpie.plugin.zsh
+++ b/plugins/httpie/httpie.plugin.zsh
--- a/plugins/jhbuild/README.md
+++ b/plugins/jhbuild/README.md
--- a/plugins/jhbuild/jhbuild.plugin.zsh
+++ b/plugins/jhbuild/jhbuild.plugin.zsh
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
--- a/plugins/jruby/jruby.plugin.zsh
+++ b/plugins/jruby/jruby.plugin.zsh
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
--- a/plugins/kitchen/_kitchen
+++ b/plugins/kitchen/_kitchen
--- a/plugins/laravel4/laravel4.plugin.zsh
+++ b/plugins/laravel4/laravel4.plugin.zsh
--- a/plugins/laravel5/laravel5.plugin.zsh
+++ b/plugins/laravel5/laravel5.plugin.zsh
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
--- a/plugins/lighthouse/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
--- a/plugins/marked2/README.md
+++ b/plugins/marked2/README.md
--- a/plugins/marked2/marked2.plugin.zsh
+++ b/plugins/marked2/marked2.plugin.zsh
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md