From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 25 Feb 2014 21:01:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'alfh/feature_qos_description' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f2b8668fc8d3590e426d716068b3b59f0f58a3a1

Merge remote-tracking branch 'alfh/feature_qos_description' into next
---

f2b8668fc8d3590e426d716068b3b59f0f58a3a1