]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05f64a9 7ba4b2a)
Merge remote-tracking branch 'stevee/compat-xz'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Jun 2015 15:16:09 +0000 (17:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Jun 2015 15:16:09 +0000 (17:16 +0200)

Trivial merge
Alex's tree of IPFire 3.x