Merge remote-tracking branch 'beak/next' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 12 Sep 2012 07:14:08 +0000 (09:14 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 12 Sep 2012 07:14:08 +0000 (09:14 +0200)
commitd1e011bc62bede509d8482dfeea950823b974413
tree9115d456b8ea43622c0d4faad48959c4457cebe2
parent77e1ba0c544701f3291f010808dd6e9c3e248054
parenta326f3daa87f842d44f198bb456a5ece95b2d725
Merge remote-tracking branch 'beak/next' into next
src/main/java/net/pterodactylus/sone/core/Core.java