Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...
commit124ed75214f53880e22371b59c35d1f47e5d3bcf
authorGerhard Lausser <gerhard.lausser@consol.de>
Sat, 12 Feb 2011 18:05:03 +0000 (12 19:05 +0100)
committerGerhard Lausser <gerhard.lausser@consol.de>
Sat, 12 Feb 2011 18:05:03 +0000 (12 19:05 +0100)
tree44f95796b9f0b3817d14b573f08bea870ce3cff4
parentdc1d280a9e1f7e23dafeec35525a8dc85fd94b8b
parent07ed8b1200bc689d8d935e3219b37724639d2790
Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot/shinken/shinken