From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 13 Oct 2012 08:18:23 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8.5^2~18
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=351ac31925b0f8f6ba1a4132997e85b7175c48da;hp=d91ae2f3375d710ea5ef7a45e5416b520ae058c2

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index bcc9946..3b894ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.8.3</version>
+	<version>0.8.4</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index 3325cd5..3f4d235 100644
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -49,7 +49,7 @@ public class UpdateChecker {
 	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
 
 	/** The current latest known edition. */
-	private static final int LATEST_EDITION = 54;
+	private static final int LATEST_EDITION = 55;
 
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 0f8ba97..5b28b85 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -84,7 +84,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 8, 3);
+	public static final Version VERSION = new Version(0, 8, 4);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);