Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...
commitdc1d280a9e1f7e23dafeec35525a8dc85fd94b8b
authorGerhard Lausser <gerhard.lausser@consol.de>
Fri, 11 Feb 2011 12:50:51 +0000 (11 13:50 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Fri, 11 Feb 2011 12:50:51 +0000 (11 13:50 +0100)
tree52230c6bb40da3ee414a4796dcc9bc1d32bfe5ff
parent263a004db1b4b955ca39d83817012f966638c055
parent429e804735779067caaa8c1cd8f1ba7eede986c0
Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot/shinken/shinken