projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efca40b 961f3db)
Merge commit '961f3dbcd8675f8b62ecd2404a709e47ec2ae343' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 14:01:24 +0000 (15:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 14:01:24 +0000 (15:01 +0100)

Trivial merge
Timo's tree of IPFire 2.x