From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Jan 2015 13:44:37 +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=95ef7be8dfd4c18ffa419bac6eeb3b0e4ea414e1;p=people%2Fms%2Fipfire-2.x.git

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

95ef7be8dfd4c18ffa419bac6eeb3b0e4ea414e1