projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21b21d9 2d490a7)
Merge remote-tracking branch 'morlix/check_mk' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Oct 2013 11:15:36 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Oct 2013 11:15:36 +0000 (13:15 +0200)

Trivial merge
Timo's tree of IPFire 2.x