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)
commitf2b8668fc8d3590e426d716068b3b59f0f58a3a1
tree74088d01a43051a786fc10a12961519059bf6055
parent50294f93c21d7a8c9bad7bfde953856d45040999
parentbe7534e3fa84649724195a452404155044ed30fb
Merge remote-tracking branch 'alfh/feature_qos_description' into next