Merge branch 'master' of ssh://shinken.git.sourceforge.net/gitroot/shinken/shinken0.1
commit6c2fa4524feba9841d84071f385bb122ddeaf216
authornap <naparuba@users.sourceforge.net>
Fri, 28 May 2010 21:22:39 +0000 (28 23:22 +0200)
committernap <naparuba@users.sourceforge.net>
Fri, 28 May 2010 21:22:39 +0000 (28 23:22 +0200)
treef9a9e01dce2fdbd24d7a5d48537aba46e17fd7de
parent94d50b5a3d14ab3f8d881c4dc98804e6eaa7d902
parent63e8fa90a81e79fd5f807297d4eea91702d0eb52
Merge branch 'master' of ssh://shinken.git.sourceforge.net/gitroot/shinken/shinken
src/shinken-broker.py