]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'ms/fake-uname'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 12:50:55 +0000 (13:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 12:50:55 +0000 (13:50 +0100)
Conflicts:
lfs/fake-environ


No differences found