From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Dec 2014 11:45:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.17-core87~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e166064029944a4da45667f4c3ae86cf4a50bc;p=ipfire-2.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
---

22e166064029944a4da45667f4c3ae86cf4a50bc