nmittler 054e4c5233 Merge branch 'master' of https://github.com/netty/netty into http2 ... Conflicts: example/src/main/java/io/netty/example/http2/client/Http2Client.java example/src/main/java/io/netty/example/http2/client/Http2ClientInitializer.java example/src/main/java/io/netty/example/http2/server/Http2Server.java example/src/main/java/io/netty/example/http2/server/Http2ServerInitializer.java		2014-05-21 07:44:18 -07:00
..
main/java/io/netty/handler/codec/http2	Adding a general handler for upgrading protocols	2014-05-19 07:30:18 -07:00
test/java/io/netty/handler/codec/http2	Fix resource leak in DefaultHttp2FrameIOTest	2014-05-21 12:54:36 +09:00