Merge remote-tracking branch 'robbyrussell/master'

18ef1ee6 · Dawid Ferenczy · eafd5f32 · 192de6bc · 18ef1ee6 · 18ef1ee6
Commit 18ef1ee6 authored Aug 25, 2015 by Dawid Ferenczy
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
--- a/plugins/taskwarrior/taskwarrior.plugin.zsh
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
--- a/plugins/textastic/README.md
+++ b/plugins/textastic/README.md
--- a/plugins/textastic/textastic.plugin.zsh
+++ b/plugins/textastic/textastic.plugin.zsh
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
--- a/plugins/tugboat/_tugboat
+++ b/plugins/tugboat/_tugboat
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
--- a/plugins/wd/LICENSE
+++ b/plugins/wd/LICENSE
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md