# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1326678825 0
# Node ID f937d449075d1d84a5773ba10b4ee02e95588c34
# Parent  93793a867c18d1a61baedbc858ba68799725dcfe# Parent  f03fc4cde6776c8be9aa7da85481ecd405e053c9
Merge with upstream

diff -r f03fc4cde677 -r f937d449075d src/buffer_event.c
diff -r f03fc4cde677 -r f937d449075d src/event_buffer.c