From 609b0e73e5db0e9037183c166673b6f837996d09 Mon Sep 17 00:00:00 2001
From: Marcus Whybrow <marcus@marcuswhybrow.net>
Date: Wed, 27 Jun 2012 19:01:24 +0100
Subject: [PATCH] Bumped to version 0.3.1.

---
 CHANGELOG.markdown | 5 +++++
 init/msm           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 4101646..7f569d3 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -11,9 +11,14 @@ Maintainers:
 Change Log
 ----------
 
+### [0.3.1](https://github.com/marcuswhybrow/minecraft-server-manager/compare/0.3.0...0.3.1)
+
+* Prevented `DEFAULT_SERVER_CONF` from being a required setting.
+
 ### [0.3.0](https://github.com/marcuswhybrow/minecraft-server-manager/compare/0.2.16...0.3.0)
 
 * Closes [#22][#22], by merging `server.conf` into `server.properties`.
+* Removed the `DEFAULT_SERVER_CONF` setting from `/etc/msm.conf`.
 
 [#22]: https://github.com/marcuswhybrow/minecraft-server-manager/issues/22
 
diff --git a/init/msm b/init/msm
index 97a0d5f..efd557c 100755
--- a/init/msm
+++ b/init/msm
@@ -25,7 +25,7 @@ CONF="${MSM_CONF:-/etc/msm.conf}"
 
 
 ### The Minecraft Server Manager version, use "msm version" to check yours.
-VERSION="0.3.0 Beta"
+VERSION="0.3.1 Beta"
 
 
 ### Config variables the user should not need/want to change