From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Mar 2012 10:33:51 +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=94d514360243e08992a840d8570c82fd03c7e603;p=ipfire-3.x.git

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

94d514360243e08992a840d8570c82fd03c7e603