2 Commits

Author	SHA1	Message	Date
Troy Frew	f04680f98e	Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final	2016-07-16 21:12:39 -04: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