From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Jan 2015 13:24:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.17-core87~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=325a846a10e80385e12f08c72bfda19690c0aa5d;p=ipfire-2.x.git

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

325a846a10e80385e12f08c72bfda19690c0aa5d