Merge branch 'libevent' of ssh://git.citadel.org/appl/gitroot/citadel into libevent
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 30 Jan 2011 14:29:59 +0000 (15:29 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 30 Jan 2011 14:29:59 +0000 (15:29 +0100)
commita25aad2034f79b31c3fbe8442ff2847d5f322d68
tree5f245bc546c7e8dec811ec8f1ff215f158f004ba
parent757d27c6e4c9eefec77b1b4c4c41ea2a8b312007
parent0a200b8a84a25a77b9027fd7274beedad6314eae
Merge branch 'libevent' of ssh://git.citadel.org/appl/gitroot/citadel into libevent