]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0a80f0 6b7e3f4)
Merge remote branch 'stevee/netplugd' into netplugd netplugd
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Nov 2010 22:14:47 +0000 (23:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Nov 2010 22:14:47 +0000 (23:14 +0100)

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