]> 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: 9d9c825 ce12ce8)
Merge branch 'check_mk' of https://github.com/morlix/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 23 Jul 2014 18:57:22 +0000 (20:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 23 Jul 2014 18:57:22 +0000 (20:57 +0200)

Trivial merge
IPFire 2.x development tree