Added Timeout for poolboy:transaction
Merge remote-tracking branch 'mainstream/master'

Conflicts:
	src/poolboy.erl
Merge pull request #17 from lefan/master

poolboy:transaction/3 Timeout support