From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2012 18:50:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=225695277cd417af48aeab52559341db353af2c8;p=ipfire.org.git

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

225695277cd417af48aeab52559341db353af2c8