Merge remote-tracking branch 'upstream/master' into emacs

Conflicts: plugins/emacs/emacs.plugin.zsh plugins/emacs/emacsclient.sh

Merge remote-tracking branch 'upstream/master' into emacs
Conflicts: plugins/emacs/emacs.plugin.zsh plugins/emacs/emacsclient.sh
db90589c · Tristan Carel · 7066bf7c · 57f04b92 · db90589c · db90589c
Commit db90589c authored Oct 10, 2011 by Tristan Carel
--- a/themes/nebirhos.zsh-theme
+++ b/themes/nebirhos.zsh-theme
--- a/themes/norm.zsh-theme
+++ b/themes/norm.zsh-theme
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
--- a/themes/re5et.zsh-theme
+++ b/themes/re5et.zsh-theme
--- a/themes/simple.zsh-theme
+++ b/themes/simple.zsh-theme
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
--- a/themes/sunaku.zsh-theme
+++ b/themes/sunaku.zsh-theme
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
--- a/themes/superjarin.zsh-theme
+++ b/themes/superjarin.zsh-theme
--- a/themes/terminalparty.zsh-theme
+++ b/themes/terminalparty.zsh-theme
--- a/themes/thomasjbradley.zsh-theme
+++ b/themes/thomasjbradley.zsh-theme
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
--- a/themes/wuffers.zsh-theme
+++ b/themes/wuffers.zsh-theme
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
--- a/tools/install.sh
+++ b/tools/install.sh
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh