]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50294f9 be7534e)
Merge remote-tracking branch 'alfh/feature_qos_description' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 25 Feb 2014 21:01:34 +0000 (22:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 25 Feb 2014 21:01:34 +0000 (22:01 +0100)

Trivial merge
Peter's tree of IPFire 2.x