From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 8 Mar 2016 22:45:04 +0000 (+0000)
Subject: Merge branch 'bird' into next
X-Git-Tag: v2.19-core100~13
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=9ef4bbf7032d6727a6debc10702e9beacd0b097d

Merge branch 'bird' into next
---

9ef4bbf7032d6727a6debc10702e9beacd0b097d