Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

587832f1 · Peter Tillemans · 55cc936d · 80a60325 · 587832f1 · 587832f1
Commit 587832f1 authored Jan 02, 2013 by Peter Tillemans
--- 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/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
--- a/themes/adben.zsh-theme
+++ b/themes/adben.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
--- a/themes/frontcube.zsh-theme
+++ b/themes/frontcube.zsh-theme
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
--- a/themes/intheloop.zsh-theme
+++ b/themes/intheloop.zsh-theme
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
--- a/themes/kafeitu.zsh-theme
+++ b/themes/kafeitu.zsh-theme
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
--- a/themes/mortalscumbag.zsh-theme
+++ b/themes/mortalscumbag.zsh-theme
--- a/themes/norm.zsh-theme
+++ b/themes/norm.zsh-theme
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
--- a/themes/tjkirch_mod.zsh-theme
+++ b/themes/tjkirch_mod.zsh-theme