Commit ae5a3c8a authored by Martin Sustrik's avatar Martin Sustrik

Merge branch 'maint'

* maint:
  Version number increased.

Conflicts:
	include/zmq.h
Signed-off-by: 's avatarMartin Sustrik <sustrik@250bpm.com>
parents 18d46c81 710615cd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment