Merge branch 'develop' into stable

s0undt3ch · s0undt3ch · commit 4584f5e5d89e · 2015-08-06T14:37:43.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2015.07.xx:
+Version 2015.08.06:
 	* Fix python-requests installations for Ubuntu >= 14.04 LTS. #631, #632, #633
 	* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
 	* Exit the git checkout directory before deleting it. Thanks Bret Fisher. #634
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2015.07.22"
+__ScriptVersion="2015.08.06"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Version 2015.07.xx:`
	`1`	`+Version 2015.08.06:`
`2`	`2`	`* Fix python-requests installations for Ubuntu >= 14.04 LTS. #631, #632, #633`
`3`	`3`	`* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04`
`4`	`4`	`* Exit the git checkout directory before deleting it. Thanks Bret Fisher. #634`