]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: fac3861 33e6458)
Merge remote-tracking branch 'amarx/difflang' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Dec 2013 11:31:19 +0000 (12:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Dec 2013 11:31:19 +0000 (12:31 +0100)

Trivial merge
Timo's tree of IPFire 2.x