]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f942231 a40a1e2)
Merge remote-tracking branch 'glotzi/monit' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:14:19 +0000 (14:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:14:19 +0000 (14:14 +0200)

Trivial merge
IPFire 2.x development tree