Merge remote-tracking branch 'upstream/master'

914c47b3 · Stephen Zhuang · 692dca07 · 80a60325 · 914c47b3 · 914c47b3
Commit 914c47b3 authored Jan 06, 2013 by Stephen Zhuang
--- 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/jnrowe.zsh-theme
+++ b/themes/jnrowe.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
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
--- a/tools/install.sh
+++ b/tools/install.sh
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh