]> 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: a5b6959 a9b8f2e)
Merge remote-tracking branch 'stevee/xen-dev86'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Dec 2011 09:25:11 +0000 (10:25 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Dec 2011 09:25:11 +0000 (10:25 +0100)

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