Merge remote branch 'jsnyder-tree/master'
commitf8d54bf2cdc9b1ceb2282d7571ca5d98378958f6
authorThomas Harning Jr <harningt@gmail.com>
Sun, 16 Jan 2011 01:32:15 +0000 (15 20:32 -0500)
committerThomas Harning Jr <harningt@gmail.com>
Sun, 16 Jan 2011 01:32:15 +0000 (15 20:32 -0500)
tree20a7198cd5012bb1fcde84643ca98e93eb720706
parent44195b4d95e97c5aee151ae133c6d445d122a519
parent9e1dbdb305e702fed889574e0a953650574cf8d6
Merge remote branch 'jsnyder-tree/master'

Conflicts:
CHANGELOG
Makefile
README
CHANGELOG
Makefile
src/buffer_event.c