]> 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: 73db16d 7ce4332)
Merge remote-tracking branch 'stevee/kbd'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Oct 2011 15:17:42 +0000 (17:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Oct 2011 15:17:42 +0000 (17:17 +0200)

Trivial merge
IPFire 3.x development tree