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)

Trivial merge