Merge branch 'feature/zeroTimeoutHandling' into develop
commite4ac8ddfbec8ceb527e6ff408a37ea695d755621
authorThomas Harning Jr <harningt@gmail.com>
Sat, 26 Dec 2015 19:02:41 +0000 (26 14:02 -0500)
committerThomas Harning Jr <harningt@gmail.com>
Sat, 26 Dec 2015 19:02:41 +0000 (26 14:02 -0500)
tree9de0442effa60ef9d421b78e276ca9f4b4248f96
parent91f66eec03e01af13859aaf16861867fcf85fe5d
parente9efea74d2eb8f3b1cb7ee2d3d0c83a88524ac2e
Merge branch 'feature/zeroTimeoutHandling' into develop

* feature/zeroTimeoutHandling:
  event_callback: handle 0 timeout properly