From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Oct 2012 13:43:16 +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=617227c4a37d5c7dc0d4bd4673f70712b653d7de;p=ipfire.org.git

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

617227c4a37d5c7dc0d4bd4673f70712b653d7de