Merge branch 'hotfix-3.1.1' into develop

CHANGELOG.rst

@@ -2,8 +2,8 @@ Changelog
 =========
 
 
-not yet released
-----------------
+v3.1.1 (released November 6, 2014)
+----------------------------------
 
 * #130: Added Czech translation.
 * #138: Added Polish translation.

README.rst

@@ -1,7 +1,7 @@
 PHP Server Monitor
 ==================
 
-Version 3.1.0
+Version 3.1.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'
+version = '3.1.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');
+define('PSM_VERSION', '3.1.1');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.
@@ -117,4 +117,4 @@ define('PSM_PUSHOVER_CLONE_URL', 'https://pushover.net/apps/clone/php_server_mon
  * By defining the PSM_BASE_URL, you will force the psm_build_url() to use this.
  * Useful for cronjobs if it cannot be auto-detected.
  */
-//define('PSM_BASE_URL', null);
+//define('PSM_BASE_URL', null);