Merge branch 'master' of ssh://shinken.git.sourceforge.net/gitroot/shinken/shinken
commit01521538224d9df8d81584262e2e56fc485af43a
authorGerhard Lausser <gerhard.lausser@consol.de>
Mon, 7 Feb 2011 14:41:06 +0000 (7 15:41 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Mon, 7 Feb 2011 14:41:06 +0000 (7 15:41 +0100)
treef7cdc97fad363d4ae1c192c5a244ec43b9786ae4
parent84bfa91f6a3925f2a635d0cdb267baf0d9a927d0
parent9051cdee4a57084289b50603d1805232053f59e7
Merge branch 'master' of ssh://shinken.git.sourceforge.net/gitroot/shinken/shinken