]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99f96fa f13d4e0)
Merge remote-tracking branch 'ms/fake-uname' into next
authorroot <root@panda.(none)>
Sun, 18 Dec 2011 15:04:55 +0000 (16:04 +0100)
committerroot <root@panda.(none)>
Sun, 18 Dec 2011 15:04:55 +0000 (16:04 +0100)

Trivial merge
IPFire 2.x development tree