Merge "KafkaHandler: allow customizing timeouts"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 29 Jan 2016 19:16:03 +0000 (19:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 29 Jan 2016 19:16:03 +0000 (19:16 +0000)

Trivial merge