-
https://github.com/aberenguel/OpenfireTom Evans authored
Conflicts: build/lib/versions.txt src/java/org/jivesoftware/openfire/nio/ClientConnectionHandler.java src/java/org/jivesoftware/openfire/nio/NIOConnection.java src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
2df53fe9