From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 15 Jan 2013 16:19:09 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d5a035f47f1c9d039c035cb4b4fd27d4c06bdcb;p=ipfire.org.git

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

4d5a035f47f1c9d039c035cb4b4fd27d4c06bdcb