From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 24 Jan 2013 05:10:32 +0000 (+0100)
Subject: Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical
X-Git-Tag: 0.8.5^2~3^2~58^2~5
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3b751d0c053450961bb66d2507d6187ce56f8785;hp=3b751d0c053450961bb66d2507d6187ce56f8785

Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical

Conflicts:
	src/main/java/net/pterodactylus/sone/core/Core.java
---