4 Commits (0ef9143ffd74ab383f3afbf0a8e07442cdc9a3b1)

Author	SHA1	Message	Date
Darien Raymond	b2c7b1a120	fix dead loop in merging reader	2017-03-28 13:10:57 +02:00
Darien Raymond	f643344154	merge buf stream	2017-03-27 11:26:44 +02:00
Darien Raymond	14824c8451	fix timeout reader usage	2017-03-27 11:14:55 +02:00
Darien Raymond	cb0e29ccdb	merging reader	2017-03-27 11:12:34 +02:00