Merge branch 'develop' into stable

s0undt3ch · s0undt3ch · commit 1a36092814c0 · 2015-02-27T01:39:50.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2015.02.15:
+Version 2015.02.27:
 	* Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van 
 	Zantvoort(The-Loeki)
 	* No need to install packages from the Unstable repository for debian, use backports. Thanks 
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.02.15"
+__ScriptVersion="2015.02.27"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Version 2015.02.15:`
	`1`	`+Version 2015.02.27:`
`2`	`2`	`* Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van`
`3`	`3`	`Zantvoort(The-Loeki)`
`4`	`4`	`* No need to install packages from the Unstable repository for debian, use backports. Thanks`