Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...
commit63b26b15cd988a3e1729dbaa16a0bcfc08a2f1c9
authorGerhard Lausser <gerhard.lausser@consol.de>
Thu, 3 Feb 2011 19:24:43 +0000 (3 20:24 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Thu, 3 Feb 2011 19:24:43 +0000 (3 20:24 +0100)
tree860d63fb4250fe6d216066b013d8aeb07e4f929a
parent2ccf1cc3c2b47e176b3b9cb00f465dcd536ecead
parentf1f5f950d881d39840a3146c94c3bdd45182c64f
Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot/shinken/shinken