From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 May 2013 11:20:42 +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=d56bc1f7ffd3dde473f36b92b5ec81345d84929f;p=ipfire.org.git

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

d56bc1f7ffd3dde473f36b92b5ec81345d84929f