Merge branch 'release-3.0.1' into develop

.gitattributes

@@ -1,3 +1,2 @@
 .gitignore export-ignore
 .gitattributes export-ignore  
-./Makefile export-ignore

CHANGELOG.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-not yet released
+v3.0.1 (released April 12, 2014)
 ----------------
 
 * #56: Minimum PHP version is PHP 5.3.7 (not PHP 5.3.0).

Makefile

@@ -15,6 +15,7 @@ export:
 	@echo 'Building HTML documentation'
 	cd ./build/phpservermon/docs; make BUILDDIR=. html; cd ../../../;
 	@echo 'Cleaning up docs dir'
+	rm -f ./build/phpservermon/Makefile
 	rm -f ./build/phpservermon/docs/Makefile
 	rm -f ./build/phpservermon/docs/make.bat
 	rm -f ./build/phpservermon/docs/conf.py

README.rst

@@ -1,7 +1,7 @@
 PHP Server Monitor
 ==================
 
-Version 3.1.0-dev
+Version 3.0.1
 
 PHP Server Monitor is a script that checks whether your websites and servers are up and running.
 It comes with a web based user interface where you can manage your services and websites,

docs/conf.py

@@ -51,7 +51,7 @@ copyright = u'2008-2014, Pepijn Over'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.0-dev'
+version = '3.0.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

src/includes/psmconfig.inc.php

@@ -29,7 +29,7 @@
 /**
  * Current PSM version
  */
-define('PSM_VERSION', '3.1.0-dev');
+define('PSM_VERSION', '3.0.1');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.