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/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/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
--- a/themes/blinks.zsh-theme
+++ b/themes/blinks.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/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