projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc05155 1235b1f)
Merge remote-tracking branch 'alfh/feature_updxlrator' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:46:21 +0000 (20:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:46:21 +0000 (20:46 +0100)

Trivial merge
Timo's tree of IPFire 2.x