script commit and merge
script pour fusionner avec upstream
bug commitAndMerge
pullAndMerge
Merge branch 'master' into a2zi
Revert "remove alternative salt"

This reverts commit f6a784b885bb5649bc9188ce8475794dcc1384d8.
utilisation des depots A2Zi
merge master
Merge branch 'master' into a2zi
push
Merge remote-tracking branch 'upstream/master' into a2zi
Merge branch 'master' into a2zi
pullAndMerge à la fin du script
Merge branch 'master' into a2zi
Merge branch 'a2zi' of github.com:A2Zi/Springbok-Framework into a2zi

Conflicts:
	mergeFromUpstream.sh
Merge branch 'master' into a2zi
Merge branch 'master' into a2zi
Merge branch 'master' into a2zi
Merge remote-tracking branch 'upstream/master' into a2zi
Merge branch 'master' into a2zi