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)
1  2 
citadel/event_client.c

Simple merge