From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 2 Apr 2011 22:18:02 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.6.1^2~49
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=9010ebc0ff528c01d11ba20ad1ab5a6ff8696787;hp=2d71e6e08455fded13ebfb7327e4ab23068ab0b3

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index 985ceb0..690bb17 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.5.2</version>
+	<version>0.6</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
 			<artifactId>utils</artifactId>
-			<version>0.9.2-SNAPSHOT</version>
+			<version>0.9.2</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 635b734..3b6824b 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, 5, 2);
+	public static final Version VERSION = new Version(0, 6);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);