]> 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: ab78971 89c275d)
Merge remote branch 'stevee/hplip'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Apr 2010 12:08:04 +0000 (14:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Apr 2010 12:08:04 +0000 (14:08 +0200)

Trivial merge
IPFire 3.x development tree