]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2d4f68 38ace2f)
Merge remote-tracking branch 'morlix/check_mk' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jul 2014 19:34:06 +0000 (21:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jul 2014 19:34:06 +0000 (21:34 +0200)

Trivial merge
Peter's tree of IPFire 2.x