Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...
commitc9b463a50625624c8a326af3f130e52efba94e78
authorGerhard Lausser <gerhard.lausser@consol.de>
Fri, 14 Jan 2011 14:27:53 +0000 (14 15:27 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Fri, 14 Jan 2011 14:27:53 +0000 (14 15:27 +0100)
treea6697e29ea9c5fa2c89671efcbe9148e60af248a
parentf948f7a530916008528676b4ac78f3cc2ea5fc75
parent6d206bca9efe6154f85bb91c4980018fb60ae31a
Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot/shinken/shinken