Merge commit 'ms/nrpe'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 5 Aug 2011 14:57:50 +0000 (16:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 5 Aug 2011 14:57:50 +0000 (16:57 +0200)
commitb444b20ccfdf8ddb981059e2bc8e560434ee524b
treed8c7829c166cb7285fc48ecdad4ac5bcc967e46b
parent57f898646a9c792ec1865e2b7fdb11ef9a56cbde
parent8092f272494e25a04e5a410653d8e5715006f0f9
Merge commit 'ms/nrpe'