Particular/NServiceBus — pull request #2235 by synhershko (2014-07-15 23:45:41+00:00)
Title: Don't lose timeouts

Backwards port of the fix to #2133

/cc @johnsimons @SimonCropp @andreasohlund