From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 10 Apr 2011 19:43:22 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: beta-freefall-0.6.2-1~8^2~5
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=db92901d72d33579498829558408916adcba2515;hp=25268a9eaec7aa079e9b3dcc25ced0bbddd493b5

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index 21f47ee..33fd6be 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</version>
+	<version>0.6.1</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
 			<artifactId>utils</artifactId>
-			<version>0.9.3-SNAPSHOT</version>
+			<version>0.9.3</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 3b6824b..de4fee8 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, 6);
+	public static final Version VERSION = new Version(0, 6, 1);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);