Add the ZMQ_CONFLATE option.
Merge pull request #288 from GreatFruitOmsk/master

Add the ZMQ_CONFLATE option.
fix jni getLongSockopt
Merge pull request #289 from ealgell/fix-285

fix jni getLongSockopt
Add missing getConflate method to get value of the ZMQ_CONFLATE option.
Merge pull request #292 from GreatFruitOmsk/master

Add missing getConflate method to get value of the ZMQ_CONFLATE option.
Add missing java classes to make files.
Include all class files in the resulting jar.
Merge pull request #293 from GreatFruitOmsk/master

Refs #291. Include missing class files.
Added missing .class files with a '$' in them to JAR.
Removed makefile duplicate
Fixed 'No rule to make target' error in makefile
Makefiles can now be executed multithreaded
Fixed perf failing to build multithreaded
Restore the JZMQ_CLASS_FILES vairable.
Merge pull request #294 from GreatFruitOmsk/master

Remove unused make file. Ensure make won't fail on various platforms and all class files will be included.
Fix regression with issue #283
Merge pull request #295 from trevorbernard/master

Fix regression with issue #283
Fix type of the ZMQ_CONFLATE option in native method.
Fix missing definition of the ZMQ_CONFLATE option in native methods.
Merge pull request #297 from GreatFruitOmsk/master

Fix ZMQ_CONFLATE in native methods.