2 Commits

Author	SHA1	Message	Date
Spigot	77c0da2f07	Upstream merge: conflict resolution and version bump ... By: md_5 <git@md-5.net>	2014-05-15 17:05:45 +10:00
Spigot	b86bbe69d4	Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream ... By: Thinkofdeath <thinkofdeath@spigotmc.org>	2014-05-14 14:05:42 +01:00