Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...
commitb1f8ad0fe84d587465b5697c99623fa13d48c0ba
authorGerhard Lausser <gerhard.lausser@consol.de>
Mon, 3 Jan 2011 16:04:13 +0000 (3 17:04 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Mon, 3 Jan 2011 16:04:13 +0000 (3 17:04 +0100)
treeac3c2e38d13fa34770b729f9cd8f090cccc60ce9
parentb4b985917a0a7aa171f87e1d38a3758fcdb397f2
parentf3e43f91d9881d09ff02a999bbe3db94eb5d8f65
Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot/shinken/shinken