]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e659ba5 477e28c)
Merge remote-tracking branch 'jlentfer/foomatic' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Jun 2012 18:27:19 +0000 (20:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Jun 2012 18:27:19 +0000 (20:27 +0200)

Trivial merge
IPFire 2.x development tree