]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0a3d81 38ace2f)
Merge remote-tracking branch 'morlix/check_mk'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Aug 2014 08:28:57 +0000 (10:28 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Aug 2014 08:28:57 +0000 (10:28 +0200)

Trivial merge
IPFire 2.x development tree