2 Commits

Author	SHA1	Message	Date
Jamie Mansfield	d1b744857b	Update upstream	2016-08-16 00:47:02 +01:00
Techcable	05fc872738	Make the Netty 4.1 upgrade one of the first patches ... @aikar suggested this so patches don't have conflicts with netty 4.1	2016-05-31 12:49:57 -06:00