Merge branch 'prosody-tree'

bufferevent compiler-flag fix regarding >= 2.0 ... must rebuild between 1.4 and 2.0 version builds

malloc.h -> stdlib.h (thanks nulani)

(0) -30 -10 -3 +3 +10 tip

mercurial