]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
projects / people / stevee / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae2084c aa7b07b)
Merge remote-tracking branch 'stevee/lm_sensors'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 12:18:42 +0000 (13:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 12:18:42 +0000 (13:18 +0100)

Trivial merge
Stefan's tree of IPFire 3.x.