From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 29 Nov 2011 08:19:31 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.7.6^2~2
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=f4a0aeb375542f8234cff6209d1557fde0b3185d;hp=cfcacd4a1983a0f24a99eb6c94af9e2314a2001b

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index 84c9b5f..96a9494 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.7.4</version>
+	<version>0.7.5</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
 			<artifactId>utils</artifactId>
-			<version>0.11.4-SNAPSHOT</version>
+			<version>0.11.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 5e52b0e..6a2c1ca 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, 7, 4);
+	public static final Version VERSION = new Version(0, 7, 5);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);