]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 765c3d0 4203c53)
Merge branch 'xen' of git://git.ipfire.org/ipfire-2.x into origin/xen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Apr 2009 13:51:24 +0000 (15:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Apr 2009 13:51:24 +0000 (15:51 +0200)
Conflicts:
lfs/linux-xen


Trivial merge
Peter's tree of IPFire 2.x