]> 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: 53103ab 8996f5a)
Merge remote-tracking branch 'mfischer/acpid' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:50:34 +0000 (17:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:50:34 +0000 (17:50 +0100)

Trivial merge
Peter's tree of IPFire 2.x