Merge remote-tracking branch 'upstream/master'

Conflicts: lib/aliases.zsh

Merge remote-tracking branch 'upstream/master'
Conflicts: lib/aliases.zsh
2595484a · Sébastien M-B · 8d23a361 · 6e6cf430 · 2595484a · 2595484a
Commit 2595484a authored Feb 08, 2013 by Sébastien M-B
--- 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