Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 24 Jan 2013 05:10:32 +0000 (06:10 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 24 Jan 2013 05:10:32 +0000 (06:10 +0100)
commit3b751d0c053450961bb66d2507d6187ce56f8785
treeedf73edf9d76650adfa87d782588aa0330cb29b9
parentfd560d013c7de7b8c70b65156a41d4a6bc9aeb06
parentfcabe38e9b3abacc0d580bf0513600858aee2eca
Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical

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