From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Dec 2014 17:01:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fae88972f04acde0f011ebc1dbfbed35e522536;p=people%2Fms%2Fipfire-2.x.git

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

7fae88972f04acde0f011ebc1dbfbed35e522536