]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 351e77b 9b59951)
Merge remote-tracking branch 'stevee/hplip'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 9 Sep 2012 12:12:19 +0000 (14:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 9 Sep 2012 12:12:19 +0000 (14:12 +0200)

Trivial merge
Peter's tree of IPFire 3.x