Merge remote-tracking branch 'beak/next' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 21 Dec 2012 06:30:45 +0000 (07:30 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 21 Dec 2012 06:30:45 +0000 (07:30 +0100)
commitadc8230792298a693a8f9ba01a6db04753d15b47
tree3ebe07cb3c6ba0ecc9b3b51c3578894964e26a50
parente0174ef813d7fac8d552e964a3abae216e99f99a
parent4a0c67e05ac11c36484cbea260a5c94a7e63175f
Merge remote-tracking branch 'beak/next' into next
src/main/java/net/pterodactylus/sone/core/Core.java