]> 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: 437e671 a2591f9)
Merge remote-tracking branch 'trikolon/xen2'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Jun 2011 11:15:33 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Jun 2011 11:15:33 +0000 (13:15 +0200)

Trivial merge
IPFire 3.x development tree