Merge remote-tracking branch 'origin/master'

2013-12-09 13:05:30 +01:00
parent 666785de90 b713a1d142
commit 570696ad45
3 changed files with 2 additions and 3 deletions
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@ -129,7 +129,7 @@ class ManiaControl implements CommandListener {

 	/**
 	 * Quit ManiaControl and log the given message
-	 *
+	 *test
 	 * @param string $message        	
 	 */
 	public function quit($message = false) {
--- a/application/core/Settings/SettingManager.php
+++ b/application/core/Settings/SettingManager.php
@ -22,7 +22,6 @@ class SettingManager {
 	 * Private properties
 	 */
 	private $maniaControl = null;
-	private $configurator = null;
 	private $arrayDelimiter = ';;';

 	/**