From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 1 Dec 2011 10:40:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7b2a2e9776bdea6c57071654f47f9805a0f7f61;p=people%2Famarx%2Fipfire-3.x.git

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

a7b2a2e9776bdea6c57071654f47f9805a0f7f61