Added SCTP Codec Handlers + minor refactoring
Corrected cmd args in SCTP Sample clients
de-duplicate plugin versions
[maven-release-plugin] prepare release netty-4.0.0.Alpha5
[maven-release-plugin] prepare for next development iteration
Added SCTP Codec
Resolved conflicts in SctpData/SctpMessage refactoring
Prevent cross-site scripting
Merge remote-tracking branch 'upstream/master'
Forward ported SCTP Echo Testcases
Merge SpdyOrHttpChooser and SpdyHttpResponseStreamIdHandler into master. See #626
Add tests for AioChannelFinder implementations
Merge pull request #630 from ngocdaothanh/master

Add CORS headers
No need to use a concurrent Queue with out new thread-model. See #626
- make master an eclipse project
server handler wasn't working due to field being overwritten in subclass
Merge pull request #646 from AtKaaZ/patch1

server handler wasn't working due to field being overwritten in subclass
- undo eclipse project stuff
x
Merge remote-tracking branch 'netty/master'