Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 22 Dec 2011 20:17:50 +0000 (21:17 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 22 Dec 2011 20:17:50 +0000 (21:17 +0100)
commit7b6191e9787496d0a3157637414210832e68117b
tree31ec5ab061e66e209bb0dc2e56fde37f6712a29a
parentf42ba7e02b32a90e7b4f9adc20b3b9681e7e109d
parente1968d13f46f5c549cdf2f5ab8b63080ba45e7da
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
citadel/event_client.c