From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 25 Jul 2012 18:33:26 +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=552df849fcbae1aa3eca001e597022f3de4756b4;p=ipfire.org.git

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

552df849fcbae1aa3eca001e597022f3de4756b4