]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30e0da8 a04cd36)
Merge remote-tracking branch 'stevee/network-fix'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Oct 2012 14:49:18 +0000 (16:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Oct 2012 14:49:18 +0000 (16:49 +0200)

Trivial merge
IPFire 3.x development tree