zeromq/czmq — pull request #182 by hintjens (2013-05-21 10:14:23+00:00)
Title: Merge conflicts

Today is a day of chaotic little patches that keep breaking master. Sorry about this.