From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 2 Jan 2013 19:56:37 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f33953cb15465f8d323ffd20ae08df39b223bf2;p=ipfire-3.x.git

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

8f33953cb15465f8d323ffd20ae08df39b223bf2