From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 18 Dec 2010 09:41:12 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: beta-freefall-0.6.2-1~178
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b36762dd13eed584854aad8e0e365f01f18b1c32;hp=0bbc9d8da7dfae93fe4e7b08dbb11a99332dc17f;p=Sone.git

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index 68ed621..0eda605 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.3.4</version>
+	<version>0.3.5-1</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
 			<artifactId>utils</artifactId>
-			<version>0.7.3</version>
+			<version>0.7.4</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 5199af6..2980b68 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, 4);
+	public static final Version VERSION = new Version(0, 3, 5, 1);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);