From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 13 Oct 2013 17:21:24 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?p=people%2Fshoehn%2Fipfire.org.git;a=commitdiff_plain;h=c2055138e360ca1109662ac00efabbfd56a2698f

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

c2055138e360ca1109662ac00efabbfd56a2698f