]> 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: 60b00d1 1617a3b)
Merge remote-tracking branch 'stevee/x-system-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Feb 2013 19:56:30 +0000 (20:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Feb 2013 19:56:30 +0000 (20:56 +0100)

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