From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 6 Jan 2011 14:49:20 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.3.6.5^2~6
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=7b6e0780d1ddb377e66821aca6e3a8d8af10490a;hp=d8578cfa1024b2428a09979bdcf683163fc33382;p=Sone.git

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index fa77daa..1ceef4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.3.6-3</version>
+	<version>0.3.6-4</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 262d777..81c1472 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -78,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 3, 6, 3);
+	public static final Version VERSION = new Version(0, 3, 6, 4);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);