From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Sat, 9 Oct 2010 14:22:23 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06fb3d3711be19fe4f75039325e5f87381a71bdf;p=people%2Fms%2Fipfire-2.x.git

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

06fb3d3711be19fe4f75039325e5f87381a71bdf