source ~/.profile only if it exists
Update git-flow-avh 1.7.0
Merge pull request #2296 from pstadler/master

check_for_upgrade.sh: source ~/.profile only if it exists
Merge pull request #2303 from petervanderdoes/git-flow-avh

Update git-flow-avh 1.7.0
Making auto-correction off by default

- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
Merge pull request #2316 from BBonifield/master

Making auto-correction off by default.

Okay, I don't feel so strongly these days about this.
reworked cactus merge scripts

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
Merge remote-tracking branch 'upstream/master'
Fix in git plugin

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>