]> 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: 32e321b 2056dd3)
Merge remote-tracking branch 'amarx/collectd4' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Feb 2015 22:56:18 +0000 (23:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Feb 2015 22:56:18 +0000 (23:56 +0100)

Trivial merge
Peter's tree of IPFire 2.x