version bump
Don't make assumptions about make

use MAKE variable, set it to a sensible default.
Merge pull request #37 from igalic/gmake

Don't make assumptions about make
Forget EventEnvelope, just ship a slice.
- wrap zmq with a 'forever' socket that will reconnect/retry on
  send/recv failure.
Fix compile errors
- no more protobufs
- start to make things configurable
- add msgpack note
- set LINGER period to 0 so that when we call Close() (usually on
  failure/timeouts) any pending messages will be discarded.
- sample code for new lumberjack receiver
- use nonblockign reads/writes to signal timeouts instead of
polling/select; seems more reliable? I've had selects timeout when I'm
certain there's data to read.
.
Merge branch 'master' of github.com:jordansissel/lumberjack

Conflicts:
	Makefile
.
- don't log so much
version bump
- don't sleep too long during ack waits
Revert "- use nonblockign reads/writes to signal timeouts instead of"

This reverts commit 77dac8486b1a454a6c181fa1a8c5a9aba29b5c95.

I thought my use of 'select' was causing bugs, it wasn't. The problem I
found was in logstash's lumberjack input.

Conflicts:
	proto.c
- Add apache 2 license