From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Sun, 10 Oct 2010 05:12:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc1c56ca781324b2ef9fe895e388075df74a018a;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

dc1c56ca781324b2ef9fe895e388075df74a018a