Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...
commit48a30f075a567a0adad9c39d917f2c9c515e306f
authorGerhard Lausser <gerhard.lausser@consol.de>
Thu, 13 Jan 2011 15:24:04 +0000 (13 16:24 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Thu, 13 Jan 2011 15:24:04 +0000 (13 16:24 +0100)
treeabc2bc04b7a80e2501b85f407f73110164220fa0
parentf5fb9f474b4f0b3e82149c718f28741095525689
parente55dbc84145879bc3a41c7619927698265fad456
Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot/shinken/shinken