Merge remote-tracking branch 'upstream/master'

914c47b3 · Stephen Zhuang · 692dca07 · 80a60325 · 914c47b3 · 914c47b3
Commit 914c47b3 authored Jan 06, 2013 by Stephen Zhuang
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
--- a/plugins/themes/_theme
+++ b/plugins/themes/_theme
--- a/plugins/themes/themes.plugin.zsh
+++ b/plugins/themes/themes.plugin.zsh
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
--- a/plugins/zeus/README.md
+++ b/plugins/zeus/README.md
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
--- a/themes/3den.zsh-theme
+++ b/themes/3den.zsh-theme
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
--- a/themes/cloud.zsh-theme
+++ b/themes/cloud.zsh-theme
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
--- a/themes/frisk.zsh-theme
+++ b/themes/frisk.zsh-theme