Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2013-12-09 10:52:48 +01:00
commit e7dbded054
3 changed files with 16 additions and 14 deletions

View file

@ -20,7 +20,7 @@ if [[ -z "$epoch_target" ]]; then
epoch_target=13
fi
[ ~/.profile ] && source ~/.profile
[ -f ~/.profile ] && source ~/.profile
if [ -f ~/.zsh-update ]
then