From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 13:40:20 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org into bootstrap3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=892bb7ddeb292aabcd7b753398df06ad55d48652;p=ipfire.org.git

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

892bb7ddeb292aabcd7b753398df06ad55d48652