From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 19 Jun 2011 14:41:00 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.6.6^2~71
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=20f2125c8a15ba58cbbf6410517d233934c1dc30;hp=7e57aea19c4359bf821468201e7d8fdec6c98a7c

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index f88c9c7..36a51ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.6.4</version>
+	<version>0.6.5</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
 			<artifactId>utils</artifactId>
-			<version>0.9.6-SNAPSHOT</version>
+			<version>0.9.6</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 6259fd3..b5a7fcc 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -83,7 +83,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 6, 4);
+	public static final Version VERSION = new Version(0, 6, 5);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);