Merge commit 'c30ad3a3fcfc66d0c1757a50afe413d9942d7793' into less-critical
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 25 Jan 2013 19:14:21 +0000 (20:14 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 25 Jan 2013 19:14:21 +0000 (20:14 +0100)
commit3c04419570520b0c7158dbb8c27083d419afdf47
treee73aed72c692924b32714e8f4aa7f552d919f592
parent5eccbebb663ee7c2098ce93a5aa3834376f8e566
parentc30ad3a3fcfc66d0c1757a50afe413d9942d7793
Merge commit 'c30ad3a3fcfc66d0c1757a50afe413d9942d7793' into less-critical
src/main/java/net/pterodactylus/sone/core/Core.java