From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Jul 2013 10:04:32 +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=8ac8b3f05f7ddb89cdb68bd760a63d9fb02cd879;p=ipfire.org.git

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

8ac8b3f05f7ddb89cdb68bd760a63d9fb02cd879