]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 57f8986 8092f27)
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
Timo's tree of IPFire 2.x