From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Oct 2011 17:52:46 +0000 (+0200)
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=dbfde53218e258c5b0e660caa12458249e510631;p=ipfire-3.x.git

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

dbfde53218e258c5b0e660caa12458249e510631