From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 13 Sep 2012 12:34:58 +0000 (+0200)
Subject: Merge branch 'next' into new-database-38
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=927de326e0af0f11a27b3444f4e25b0796c877db;hp=927de326e0af0f11a27b3444f4e25b0796c877db;p=Sone.git

Merge branch 'next' into new-database-38

Conflicts:
	src/main/java/net/pterodactylus/sone/core/Core.java
	src/main/java/net/pterodactylus/sone/data/Sone.java
	src/main/java/net/pterodactylus/sone/main/SonePlugin.java
	src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
---