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